From 738d26f92c56198a22b3088bf1b0c3b641a990db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= Date: Thu, 8 Mar 2007 11:14:40 +0000 Subject: #8572 This actually bugged me to for a long time too. git-svn-id: file:///svn/phpbb/trunk@7149 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/message_parser.php | 2 +- phpBB/styles/subSilver/template/posting_body.html | 2 +- phpBB/styles/subSilver/template/posting_smilies.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 223248fe2f..97e977a42b 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1172,7 +1172,7 @@ class parse_message extends bbcode_firstpass { // (assertion) $match[] = '#(?<=^|[\n .])' . preg_quote($row['code'], '#') . '#'; - $replace[] = '' . $row['emotion'] . ''; + $replace[] = '' . $row['code'] . ''; } $db->sql_freeresult($result); } diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index 7a1e7ae79f..494671dff8 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -185,7 +185,7 @@ - {smiley.SMILEY_DESC} + {smiley.SMILEY_CODE} diff --git a/phpBB/styles/subSilver/template/posting_smilies.html b/phpBB/styles/subSilver/template/posting_smilies.html index 960e6a23b4..f48ef66c19 100644 --- a/phpBB/styles/subSilver/template/posting_smilies.html +++ b/phpBB/styles/subSilver/template/posting_smilies.html @@ -17,7 +17,7 @@ var text_name = 'message'; {L_SMILIES} - {smiley.SMILEY_DESC}
{L_CLOSE_WINDOW} + {smiley.SMILEY_CODE}
{L_CLOSE_WINDOW} -- cgit v1.2.1