diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-19 18:24:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-19 18:24:28 +0000 |
| commit | a0248584a6aaa2334ae54c2f145500b9b0a6d6a0 (patch) | |
| tree | 8ed10686ad24df1f999ea6415bd68b3628cbbc5b /phpBB | |
| parent | 65442c6bdddb2f8e5329bc9c340a070f197cfc0b (diff) | |
| download | forums-a0248584a6aaa2334ae54c2f145500b9b0a6d6a0.tar forums-a0248584a6aaa2334ae54c2f145500b9b0a6d6a0.tar.gz forums-a0248584a6aaa2334ae54c2f145500b9b0a6d6a0.tar.bz2 forums-a0248584a6aaa2334ae54c2f145500b9b0a6d6a0.tar.xz forums-a0248584a6aaa2334ae54c2f145500b9b0a6d6a0.zip | |
try to support -- in smileys by not using comments within post text display...
git-svn-id: file:///svn/phpbb/trunk@7784 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9059352bb7..fbdd236c7b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2812,7 +2812,7 @@ function smiley_text($text, $force_option = false) } else { - return str_replace('<img src="{SMILIES_PATH}', '<img src="' . $phpbb_root_path . $config['smilies_path'], $text); + return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text); } } |