diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-08-17 23:53:06 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-08-17 23:53:06 +0000 |
| commit | d25ca29ca032d73ab1824179c86e6a08ddaba1f4 (patch) | |
| tree | 780b1a898a92f4430ead61cce5fbe23d3cb84f75 /phpBB/viewtopic.php | |
| parent | 8257d1c82809165608b33268a561b53fd78675a4 (diff) | |
| download | forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.gz forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.bz2 forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.tar.xz forums-d25ca29ca032d73ab1824179c86e6a08ddaba1f4.zip | |
- 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
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 7 |
1 files changed, 4 insertions, 3 deletions
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('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">\1</span>', $message); + $row['post_subject'] = preg_replace('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">\1</span>', $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']) { |