From d25ca29ca032d73ab1824179c86e6a08ddaba1f4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 17 Aug 2007 23:53:06 +0000 Subject: - strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode - highlight in post subjects and topic titles - language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1e1788db53..a99279c642 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1252,15 +1252,16 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count); } + // Replace naughty words such as farty pants + $row['post_subject'] = censor_text($row['post_subject']); + // Highlight active words (primarily for search) if ($highlight_match) { $message = preg_replace('#(?!<.*)(?]*(?:)#is', '\1', $message); + $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#is', '\1', $row['post_subject']); } - // Replace naughty words such as farty pants - $row['post_subject'] = censor_text($row['post_subject']); - // Editing information if (($row['post_edit_count'] && $config['display_last_edited']) || $row['post_edit_reason']) { -- cgit v1.2.1