From a0248584a6aaa2334ae54c2f145500b9b0a6d6a0 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 19 Jun 2007 18:24:28 +0000
Subject: [PATCH] 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
---
 phpBB/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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