diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-01-29 19:03:58 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-01-29 19:03:58 +0000 |
| commit | a1ddf8e73b3d3b823b981f57697497f03bcb52b7 (patch) | |
| tree | 1cee896d74ad78f83878e2fd3ce3a783ba0a957c /phpBB/viewtopic.php | |
| parent | a7ee692e2608a7fb8f09886ac50e1e0884500675 (diff) | |
| download | forums-a1ddf8e73b3d3b823b981f57697497f03bcb52b7.tar forums-a1ddf8e73b3d3b823b981f57697497f03bcb52b7.tar.gz forums-a1ddf8e73b3d3b823b981f57697497f03bcb52b7.tar.bz2 forums-a1ddf8e73b3d3b823b981f57697497f03bcb52b7.tar.xz forums-a1ddf8e73b3d3b823b981f57697497f03bcb52b7.zip | |
smilies check incorrect
git-svn-id: file:///svn/phpbb/trunk@3406 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 4926ea1440..8d1223f1ce 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -757,7 +757,7 @@ if ($row = $db->sql_fetchrow($result)) // If we allow users to disable display of emoticons // we'll need an appropriate check and preg_replace here - $message = (empty($row['enable_smilies']) || empty($config['enable_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message); + $message = (empty($row['enable_smilies']) || empty($config['allow_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message); |