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/search.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/search.php')
| -rw-r--r-- | phpBB/search.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 89403c8893..9a50ce2fcb 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -776,6 +776,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$result_topic_id", true, $user->session_id) : ''; + $row['topic_title'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['topic_title']); + $tpl_ary = array( 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), @@ -864,6 +866,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) { // post highlighting $row['post_text'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['post_text']); + $row['post_subject'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['post_subject']); } $tpl_ary = array( |