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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12428] Use the database to store the original version number
  [ticket/12428] Incorrect from version in database update log entry
This commit is contained in:
Joas Schilling 2014-05-08 12:57:07 +02:00
commit f28ce51afb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/install/database_update.php
View file

@ -115,7 +115,13 @@ request_var('', 0, false, false, $request); // "dependency injection" for a func
$config = $phpbb_container->get('config'); $config = $phpbb_container->get('config');
set_config(null, null, null, $config); set_config(null, null, null, $config);
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
$orig_version = $config['version'];
if (!isset($config['version_update_from']))
{
$config->set('version_update_from', $config['version']);
}
$orig_version = $config['version_update_from'];
$user->add_lang(array('common', 'acp/common', 'install', 'migrator')); $user->add_lang(array('common', 'acp/common', 'install', 'migrator'));
@ -287,4 +293,6 @@ else
echo $user->lang['COMPLETE_LOGIN_TO_BOARD']; echo $user->lang['COMPLETE_LOGIN_TO_BOARD'];
} }
$config->delete('version_update_from');
phpbb_end_update($cache, $config); phpbb_end_update($cache, $config);