Update of /cvsroot/stack/stack-dev/install/update
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28438/install/update
Modified Files:
Updater.php index.php
Log Message:
Merging 2.2 branch
(with some additional fixes to ensure seamless updating for version lines)
Index: Updater.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/install/update/Updater.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Updater.php 27 Aug 2009 16:22:48 -0000 1.6
--- Updater.php 30 Sep 2010 16:56:14 -0000 1.7
***************
*** 21,25 ****
require_once($root.'/lib/database/StackDBBackup.php');
! define(STACK_CURRENT, 'STACK 2.0 alpha 2'); //The latest version of STACK.
class Updater{
--- 21,25 ----
require_once($root.'/lib/database/StackDBBackup.php');
! define(STACK_CURRENT, 'STACK 2.2'); //The latest version of STACK.
class Updater{
***************
*** 63,68 ****
unset($update);
! case 'STACK 2.0 alpha 2':
! //nothing yet
}
--- 63,73 ----
unset($update);
! // bit of a jump!?
!
! case 'STACK 2.0 beta':
! require_once('updates/TwoPointTwo.php'); //load the code to update STACK to 2.2
! $update = new TwoPointTwo($this->errorLog);
! $update->performUpdate();
! unset($update);
}
Index: index.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/install/update/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php 14 Nov 2008 19:05:59 -0000 1.4
--- index.php 30 Sep 2010 16:56:14 -0000 1.5
***************
*** 17,21 ****
*/
session_start();
! define(STACK_CURRENT, 'STACK 2.0 beta'); //The latest version of STACK.
$configFile = '../../config.php';
if(!file_exists($configFile))
--- 17,21 ----
*/
session_start();
! define(STACK_CURRENT, 'STACK 2.2'); //The latest version of STACK.
$configFile = '../../config.php';
if(!file_exists($configFile))
|
