mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
[ticket/11422] Increment assets when database_update is complete
PHPBB3-11422
This commit is contained in:
parent
7bb32d27ac
commit
6704a82bbe
1 changed files with 6 additions and 4 deletions
|
@ -41,10 +41,12 @@ if (!function_exists('phpbb_require_updated'))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function phpbb_end_update($cache)
|
function phpbb_end_update($cache, $config)
|
||||||
{
|
{
|
||||||
$cache->purge();
|
$cache->purge();
|
||||||
|
|
||||||
|
$config->increment('assets_version', 1);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
@ -232,7 +234,7 @@ while (!$migrator->finished())
|
||||||
{
|
{
|
||||||
echo $e->getLocalisedMessage($user);
|
echo $e->getLocalisedMessage($user);
|
||||||
|
|
||||||
phpbb_end_update($cache);
|
phpbb_end_update($cache, $config);
|
||||||
}
|
}
|
||||||
|
|
||||||
$state = array_merge(array(
|
$state = array_merge(array(
|
||||||
|
@ -265,7 +267,7 @@ while (!$migrator->finished())
|
||||||
echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
|
echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />';
|
||||||
echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>';
|
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'];
|
echo $user->lang['DATABASE_UPDATE_COMPLETE'];
|
||||||
|
|
||||||
phpbb_end_update($cache);
|
phpbb_end_update($cache, $config);
|
||||||
|
|
Loading…
Add table
Reference in a new issue