aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-20 10:13:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-20 10:13:57 +0000
commitf31626cec7275790c741d31fc815c775a509aed2 (patch)
treef53d7f40b71c53a9a5aa3f6802c11117889a886f /phpBB/includes
parent5d8ac9a393d145bafdcec94e1a60e7afd7379161 (diff)
downloadforums-f31626cec7275790c741d31fc815c775a509aed2.tar
forums-f31626cec7275790c741d31fc815c775a509aed2.tar.gz
forums-f31626cec7275790c741d31fc815c775a509aed2.tar.bz2
forums-f31626cec7275790c741d31fc815c775a509aed2.tar.xz
forums-f31626cec7275790c741d31fc815c775a509aed2.zip
#14850
git-svn-id: file:///svn/phpbb/trunk@8207 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_styles.php5
-rw-r--r--phpBB/includes/functions_display.php5
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 9e04ede90b..f4f7f8e56b 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -993,6 +993,11 @@ parse_css_file = {PARSE_CSS_FILE}
$filename = "{$cache_prefix}_$file.html.$phpEx";
+ if (!file_exists("{$phpbb_root_path}cache/$filename"))
+ {
+ continue;
+ }
+
$template->assign_block_vars('file', array(
'U_VIEWSOURCE' => $this->u_action . "&amp;action=cache&amp;id=$template_id&amp;source=$file",
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index b75747a862..05630342d1 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -826,8 +826,9 @@ function display_custom_bbcodes()
'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),
'BBCODE_TAG' => $row['bbcode_tag'],
- 'BBCODE_HELPLINE' => str_replace(array('&amp;', '&quot;', "'", '&lt;', '&gt;'), array('\&', '\"', '\\\'', '<', '>'), $row['bbcode_helpline']))
- );
+ 'BBCODE_HELPLINE' => $row['bbcode_helpline'],
+ 'A_BBCODE_HELPLINE' => str_replace(array('&amp;', '&quot;', "'", '&lt;', '&gt;'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']),
+ ));
$i++;
}