diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-03-29 08:29:22 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-03-29 08:29:22 -0700 |
| commit | 1b71779432d6325d6f7da0671a07eaf7d400bfbc (patch) | |
| tree | 835a3e0f421fe743685647a3d1218e3b2d371144 | |
| parent | e91077153ea67180dc577454e9240b3e8317bb5c (diff) | |
| parent | 6704a82bbea45ab53a05c7490c87e46e1c57dd00 (diff) | |
| download | forums-1b71779432d6325d6f7da0671a07eaf7d400bfbc.tar forums-1b71779432d6325d6f7da0671a07eaf7d400bfbc.tar.gz forums-1b71779432d6325d6f7da0671a07eaf7d400bfbc.tar.bz2 forums-1b71779432d6325d6f7da0671a07eaf7d400bfbc.tar.xz forums-1b71779432d6325d6f7da0671a07eaf7d400bfbc.zip | |
Merge pull request #1285 from EXreaction/ticket/11422
[ticket/11422] Increment assets when database_update is complete
| -rw-r--r-- | phpBB/install/database_update.php | 10 |
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); |