1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00

Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop

* github-callumacrae/ticket/10783:
  [ticket/10783] Added assets_version to ACP and simple_*.html.
  [ticket/10783] Added assets_version to subsilver2.
  [ticket/10783] Added ?assets_version to assets.
This commit is contained in:
Nils Adermann
2012-04-13 03:32:01 +02:00
13 changed files with 36 additions and 22 deletions

View File

@@ -189,6 +189,12 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
set_config(null, null, null, $config);
set_config_count(null, null, null, $config);
// Update asset_version
if (isset($config['assets_version']))
{
set_config('assets_version', $config['assets_version'] + 1);
}
// phpbb_db_tools will be taken from new files (under install/update/new)
// if possible, falling back to the board's copy.
$db_tools = new phpbb_db_tools($db, true);
@@ -2424,6 +2430,11 @@ function change_database_data(&$no_updates, $version)
$no_updates = false;
if (!isset($config['assets_version']))
{
$config->set('assets_version', '1');
}
break;
}
}