aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-01 11:04:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-01 11:04:44 +0000
commit855947f56625d0a362f4934c3e9e26cba3483fa2 (patch)
tree85835719c471bba729aadca35e653084f8bcdb86
parente8036a3131dff231deae8b2b3b57bf3638768969 (diff)
downloadforums-855947f56625d0a362f4934c3e9e26cba3483fa2.tar
forums-855947f56625d0a362f4934c3e9e26cba3483fa2.tar.gz
forums-855947f56625d0a362f4934c3e9e26cba3483fa2.tar.bz2
forums-855947f56625d0a362f4934c3e9e26cba3483fa2.tar.xz
forums-855947f56625d0a362f4934c3e9e26cba3483fa2.zip
let's try to correctly catch some conditions as well as letting the cache being updated correctly
git-svn-id: file:///svn/phpbb/trunk@7816 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_styles.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 4ab4420e6f..1ef80c34b1 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -739,6 +739,8 @@ parse_css_file = {PARSE_CSS_FILE}
// destroy the cached version of the template (filename without extension)
$this->clear_template_cache($template_info, array(substr($template_file, 0, -5)));
+ $cache->destroy('sql', STYLES_TABLE);
+
add_log('admin', 'LOG_TEMPLATE_EDIT', $template_info['template_name'], $template_file);
trigger_error($user->lang['TEMPLATE_FILE_UPDATED'] . $additional . adm_back_link($this->u_action . "&amp;action=edit&amp;id=$template_id&amp;text_rows=$text_rows&amp;template_file=$template_file"));
}
@@ -2164,6 +2166,11 @@ parse_css_file = {PARSE_CSS_FILE}
$db->sql_query($sql);
}
}
+ else if (!$store_db && !$safe_mode)
+ {
+ $store_db = 1;
+ $error[] = $user->lang['EDIT_TEMPLATE_STORED_DB'];
+ }
else if ($store_db)
{
$filelist = filelist("{$phpbb_root_path}styles/{$style_row['template_path']}/template", '', 'html');