1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-13 20:28:44 +01:00

Merge pull request #1285 from EXreaction/ticket/11422

[ticket/11422] Increment assets when database_update is complete
This commit is contained in:
Nils Adermann 2013-03-29 08:29:22 -07:00
commit 1b71779432

View File

@ -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);