1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

- 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
This commit is contained in:
Nils Adermann
2007-08-17 23:53:06 +00:00
parent 8257d1c828
commit d25ca29ca0
4 changed files with 14 additions and 8 deletions

View File

@@ -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'])
{