aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-07 02:07:30 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-07 02:07:30 +0200
commite0dbbfb4af87d301040d1bf5bcee0a64adb376ce (patch)
tree27b4d57d9c3c4feba2bd130397ea972ee2da2019 /phpBB/install
parent571d6ae852fd6bc6d3ce57b00cb1faed84f45434 (diff)
downloadforums-e0dbbfb4af87d301040d1bf5bcee0a64adb376ce.tar
forums-e0dbbfb4af87d301040d1bf5bcee0a64adb376ce.tar.gz
forums-e0dbbfb4af87d301040d1bf5bcee0a64adb376ce.tar.bz2
forums-e0dbbfb4af87d301040d1bf5bcee0a64adb376ce.tar.xz
forums-e0dbbfb4af87d301040d1bf5bcee0a64adb376ce.zip
[ticket/12428] Incorrect from version in database update log entry
https://tracker.phpbb.com/browse/PHPBB3-12428 PHPBB3-12428
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 6c9eeb6a75..91d9a792d7 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'];
+
+$orig_version = $this->cache->get('database_update_orig_version');
+if ($orig_version === false)
+{
+ $orig_version = $config['version'];
+ $cache->put('database_update_orig_version', $orig_version, 86400);
+}
$user->add_lang(array('common', 'acp/common', 'install', 'migrator'));
@@ -287,4 +293,6 @@ else
echo $user->lang['COMPLETE_LOGIN_TO_BOARD'];
}
+$cache->destroy('database_update_orig_version');
+
phpbb_end_update($cache, $config);