aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-03-09 09:21:31 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-03-10 13:02:31 -0500
commit6704a82bbea45ab53a05c7490c87e46e1c57dd00 (patch)
tree52a0c77316018688f0be3c4d4823418b0e5c82b4
parent7bb32d27ac7505b7dfc05c89be861441b1a52e15 (diff)
downloadforums-6704a82bbea45ab53a05c7490c87e46e1c57dd00.tar
forums-6704a82bbea45ab53a05c7490c87e46e1c57dd00.tar.gz
forums-6704a82bbea45ab53a05c7490c87e46e1c57dd00.tar.bz2
forums-6704a82bbea45ab53a05c7490c87e46e1c57dd00.tar.xz
forums-6704a82bbea45ab53a05c7490c87e46e1c57dd00.zip
[ticket/11422] Increment assets when database_update is complete
PHPBB3-11422
-rw-r--r--phpBB/install/database_update.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2ecddf49d4..867235e607 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -41,10 +41,12 @@ if (!function_exists('phpbb_require_updated'))
}
}
-function phpbb_end_update($cache)
+function phpbb_end_update($cache, $config)
{
$cache->purge();
+ $config->increment('assets_version', 1);
+
?>
</p>
</div>
@@ -232,7 +234,7 @@ while (!$migrator->finished())
{
echo $e->getLocalisedMessage($user);
- phpbb_end_update($cache);
+ phpbb_end_update($cache, $config);
}
$state = array_merge(array(
@@ -265,7 +267,7 @@ while (!$migrator->finished())
echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
- phpbb_end_update($cache);
+ phpbb_end_update($cache, $config);
}
}
@@ -276,4 +278,4 @@ if ($orig_version != $config['version'])
echo $user->lang['DATABASE_UPDATE_COMPLETE'];
-phpbb_end_update($cache);
+phpbb_end_update($cache, $config);