Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG (revision 718)
+++ trunk/CHANGELOG (revision 719)
@@ -10,10 +10,11 @@
# = Bugfix
! = Update/Change
-------------------------------------- 2.7.0 -------------------------------------
-20-Feb-2008 Thomas Hornik
+------------------------------------- 2.7.0 -------------------------------------
+20-Feb-2008 Thomas Hornik
! added workaround for language sorting-problem
20-Feb-2008 Christian Sommer
+! modified upgrade script and suppressed headers already send message (avoid issues with error reporting E_ALL)
# added the FCKEditor module PHP connector fix found by the forum member Luisehahne (thanks man)
! Updated upgrade script (added WB2.7 basic styles, pre-checks and disclaimer)
19-Feb-2008 Matthias Gallas
Index: trunk/wb/upgrade-script.php
===================================================================
--- trunk/wb/upgrade-script.php (revision 718)
+++ trunk/wb/upgrade-script.php (revision 719)
@@ -35,7 +35,7 @@
function check_baseline_configuration() {
// check if config.php file exists and contains values
status_msg('config.php: ');
- @include('config.php');
+ @include_once('config.php');
if(defined('WB_PATH')) {
status_msg('OK', 'ok');
} else {
@@ -50,8 +50,8 @@
// check if the WB 2.7 installation files were already uploaded via FTP
status_msg(', WB 2.7 core files uploaded: ');
- @include(WB_PATH .'/framework/functions.php');
- @include(WB_PATH .'/admin/interface/version.php');
+ @include_once(WB_PATH .'/framework/functions.php');
+ @include_once(WB_PATH .'/admin/interface/version.php');
if(defined('VERSION') && VERSION == '2.7'
&& function_exists('get_variable_content')
&& file_exists(WB_PATH .'/modules/menu_link/languages/DE.php')
@@ -71,42 +71,27 @@
return -1;
}
- // check database connection
- $wb_version = '';
+ // check database connection (try to extract a single value which should always exist)
+ $group_id = '';
status_msg(', Database connection: ');
if(class_exists('database')) {
$db = new database;
- $table = TABLE_PREFIX .'settings';
- $wb_version = @$db->get_one("SELECT value FROM $table WHERE name = 'wb_version' LIMIT 1");
+ $table = TABLE_PREFIX .'groups';
+ $group_id = @$db->get_one("SELECT group_id FROM $table WHERE group_id = '1' LIMIT 1");
}
- if($wb_version) {
+ if($group_id == '1') {
status_msg('OK', 'ok');
} else {
// output error message and return error status
status_msg('FAILED', 'error');
- status_msg('Error:
Unable to obtain the WB version stored in the database of your existing installation.'
+ status_msg('Error:
Unable to connect to your existing Website Baker database.'
.'
Make sure that the database class is available and the connection data in the config.php file is correct '
- .'and your database is not corrupted.
To check if your database is corrupted, you can use a tool like '
+ .'and your database is not corrupt.
To check if your database is corrupt, you can use a tool like '
.'phpMyAdmin.'
.'
You can not proceed before this error is fixed!!!'
, 'warning', 'div');
return -1;
}
-
- // check WB version in database is 2.6.7
- status_msg(', WB version (database): ');
- if($wb_version == '2.6.7') {
- status_msg('2.6.7 (OK)', 'ok');
- } else {
- // output a warning
- status_msg($wb_version .' (required 2.6.7)', 'error');
- status_msg('Warning:
The extracted version number from the database is ' .$wb_version .' (required 2.6.7).'
- .'
If the extracted database version is lower than 2.6.7, please upgrade first to Website Baker 2.6.7 and then to 2.7.'
- .'
If the obtained database version is higher or equal to 2.7, you do not need to execute this script.'
- .'
You can not proceed before this error is fixed!!!'
- , 'warning', 'div');
- return -1;
- }
return 0;
}
@@ -116,7 +101,7 @@
Upgrade script from Website Baker v2.6.7 to Website Baker v2.7
-
+