aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/bbcode.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-01-25 14:18:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-01-25 14:18:06 +0000
commit3dd313ed896c6df0336c5a07438efb0f136c084b (patch)
treee5e21c1bafd8989b3ae01d785a096727b9c2862f /phpBB/includes/bbcode.php
parentc8593c571529936a63304262132828dafc5ec28e (diff)
downloadforums-3dd313ed896c6df0336c5a07438efb0f136c084b.tar
forums-3dd313ed896c6df0336c5a07438efb0f136c084b.tar.gz
forums-3dd313ed896c6df0336c5a07438efb0f136c084b.tar.bz2
forums-3dd313ed896c6df0336c5a07438efb0f136c084b.tar.xz
forums-3dd313ed896c6df0336c5a07438efb0f136c084b.zip
do not parse smilies within code tag
git-svn-id: file:///svn/phpbb/trunk@4764 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
-rw-r--r--phpBB/includes/bbcode.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 5cc50c825b..67a211df0a 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -454,6 +454,7 @@ class bbcode
$code = str_replace("\t", '&nbsp; &nbsp;', $code);
$code = str_replace(' ', '&nbsp; ', $code);
$code = str_replace(' ', ' &nbsp;', $code);
+ $code = preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $code);
}
$code = $this->bbcode_tpl('code_open') . $code . $this->bbcode_tpl('code_close');