diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-28 15:37:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-28 15:37:11 +0000 |
| commit | 46bf79ec78906e2f36a8408a1edaf139ef6dd5b0 (patch) | |
| tree | 1c9dbd9026981c3eaecb2c5a993a7af847175849 /phpBB | |
| parent | 00aec3a3390e533324ad0628f93dab4734b67f7e (diff) | |
| download | forums-46bf79ec78906e2f36a8408a1edaf139ef6dd5b0.tar forums-46bf79ec78906e2f36a8408a1edaf139ef6dd5b0.tar.gz forums-46bf79ec78906e2f36a8408a1edaf139ef6dd5b0.tar.bz2 forums-46bf79ec78906e2f36a8408a1edaf139ef6dd5b0.tar.xz forums-46bf79ec78906e2f36a8408a1edaf139ef6dd5b0.zip | |
some important changes to let the update work. ;)
git-svn-id: file:///svn/phpbb/trunk@6946 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index c2e672c863..666cb1aad3 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -436,7 +436,7 @@ if ($inline_update) { if ($current_version !== $latest_version) { - set_config('version_update_from', $row['config_value']); + set_config('version_update_from', $orig_version); } } else @@ -719,7 +719,7 @@ else { ?> - <p><?php echo $lang['CONTINUE_INLINE_UPDATE']; ?></p> + <p><?php echo ((isset($lang['CONTINUE_INLINE_UPDATE'])) ? $lang['CONTINUE_INLINE_UPDATE'] : 'The database update was successful. Now please close this window and continue the update process as explained.'); ?></p> <p><a href="#" onclick="window.close();">» <?php echo $lang['CLOSE_WINDOW']; ?></a></p> diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 117c2f64fa..9913482f84 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -111,6 +111,21 @@ class install_update extends module // First of all, init the user session $user->session_begin(); $auth->acl($user->data); + + // Beta4 and below are having a bug displaying an error if the install directory is present. + // This bug got fixed, but we need to get around it by using a tiny 'hack'. + if (!defined('DEBUG_EXTRA')) + { + if (version_compare(strtolower($config['version']), '3.0.b4', '<=')) + { + @define('DEBUG_EXTRA', true); + } + else if (!empty($config['version_update_from']) && version_compare(strtolower($config['version_update_from']), '3.0.b4', '<=')) + { + @define('DEBUG_EXTRA', true); + } + } + $user->setup('install'); // If we are within the intro page we need to make sure we get up-to-date version info |