diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 12:56:59 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-08 12:56:59 +0200 |
| commit | 0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5 (patch) | |
| tree | 658a4af7bb7ea53d8f232656b5315349f536f6b3 /phpBB | |
| parent | ef99d6fcc5b8db4b6f3288918b0cbee085baf7b1 (diff) | |
| parent | 32efd5de7389ed1ee8943b2b167ae427a6847d1f (diff) | |
| download | forums-0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5.tar forums-0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5.tar.gz forums-0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5.tar.bz2 forums-0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5.tar.xz forums-0c3c77c6bfd2648c1b9d2cc9c80363155f5be0c5.zip | |
Merge pull request #2422 from Nicofuma/ticket/12428
[ticket/12428] Incorrect from version in database update log entry
* Nicofuma/ticket/12428:
[ticket/12428] Use the database to store the original version number
[ticket/12428] Incorrect from version in database update log entry
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6c9eeb6a75..b1bfbc1839 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -115,7 +115,13 @@ request_var('', 0, false, false, $request); // "dependency injection" for a func $config = $phpbb_container->get('config'); set_config(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')); @@ -287,4 +293,6 @@ else echo $user->lang['COMPLETE_LOGIN_TO_BOARD']; } +$config->delete('version_update_from'); + phpbb_end_update($cache, $config); |