slight change for 3.0.5 for updating.

- only return auth options having 2 or more columns (does not change the outcome, the script works fine)
- purge the theme after a successful update the easy way to let style.php do the job

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9510 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-05-06 08:38:30 +00:00
parent 4bf4f8588e
commit 6c3532761b
2 changed files with 6 additions and 15 deletions

View file

@ -943,7 +943,7 @@ function change_database_data(&$no_updates, $version)
$sql = 'SELECT auth_option $sql = 'SELECT auth_option
FROM ' . ACL_OPTIONS_TABLE . ' FROM ' . ACL_OPTIONS_TABLE . '
GROUP BY auth_option GROUP BY auth_option
HAVING COUNT(*) >= 1'; HAVING COUNT(*) >= 2';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$auth_options = array(); $auth_options = array();

View file

@ -454,7 +454,7 @@ class install_update extends module
// Refresh prosilver css data - this may cause some unhappy users, but // Refresh prosilver css data - this may cause some unhappy users, but
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_THEME_TABLE . " FROM ' . STYLES_THEME_TABLE . "
WHERE theme_name = 'prosilver'"; WHERE LOWER(theme_name) = 'prosilver'";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$theme = $db->sql_fetchrow($result); $theme = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -491,22 +491,13 @@ class install_update extends module
if ($recache) if ($recache)
{ {
include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx); // Instead of re-caching here, we simply remove theme_data... HAR HAR HAR (think about a carribean pirate)
$sql = 'UPDATE ' . STYLES_THEME_TABLE . " SET theme_data = ''
$theme['theme_data'] = acp_styles::db_theme_data($theme); WHERE theme_id = " . $theme['theme_id'];
$theme['theme_mtime'] = $update_time;
// Save CSS contents
$sql_ary = array(
'theme_mtime' => $theme['theme_mtime'],
'theme_data' => $theme['theme_data']
);
$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE theme_id = ' . $theme['theme_id'];
$db->sql_query($sql); $db->sql_query($sql);
$cache->destroy('sql', STYLES_THEME_TABLE); $cache->destroy('sql', STYLES_THEME_TABLE);
$cache->destroy('sql', STYLES_TABLE);
} }
} }