makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

some important changes to let the update work. ;)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6946 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-01-28 15:37:11 +00:00
parent 00aec3a339
commit 46bf79ec78
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/install/database_update.php
View file

@ -436,7 +436,7 @@ if ($inline_update)
{ {
if ($current_version !== $latest_version) if ($current_version !== $latest_version)
{ {
set_config('version_update_from', $row['config_value']); set_config('version_update_from', $orig_version);
} }
} }
else 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();">&raquo; <?php echo $lang['CLOSE_WINDOW']; ?></a></p> <p><a href="#" onclick="window.close();">&raquo; <?php echo $lang['CLOSE_WINDOW']; ?></a></p>

15
phpBB/install/install_update.php
View file

@ -111,6 +111,21 @@ class install_update extends module
// First of all, init the user session // First of all, init the user session
$user->session_begin(); $user->session_begin();
$auth->acl($user->data); $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'); $user->setup('install');
// If we are within the intro page we need to make sure we get up-to-date version info // If we are within the intro page we need to make sure we get up-to-date version info