From a1ddf8e73b3d3b823b981f57697497f03bcb52b7 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Wed, 29 Jan 2003 19:03:58 +0000
Subject: [PATCH] smilies check incorrect

git-svn-id: file:///svn/phpbb/trunk@3406 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);