diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:43:55 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 17:43:55 +0200 |
| commit | b4e673acc1ec5da11666277f340ac579e054b608 (patch) | |
| tree | a5ce36e8676a35a6d10eccdd04589815c06dd322 | |
| parent | 6b798d02fbe8fb3fcb2067856fe27ba737fe7650 (diff) | |
| parent | ae76bfc99e588c14f612738d1abca2312167391d (diff) | |
| download | forums-b4e673acc1ec5da11666277f340ac579e054b608.tar forums-b4e673acc1ec5da11666277f340ac579e054b608.tar.gz forums-b4e673acc1ec5da11666277f340ac579e054b608.tar.bz2 forums-b4e673acc1ec5da11666277f340ac579e054b608.tar.xz forums-b4e673acc1ec5da11666277f340ac579e054b608.zip | |
Merge pull request #4470 from rxu/ticket/14801
[ticket/14801] Highlighting utf8 strings in search results
* rxu/ticket/14801:
[ticket/14801] Highlighting utf8 strings in search results
| -rw-r--r-- | phpBB/search.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 03575f7e0b..89f0e574c3 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1060,7 +1060,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) $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) : ''; $u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&mode=deleted_topics&t=$result_topic_id", true, $user->session_id) : $u_mcp_queue; - $row['topic_title'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $row['topic_title']); + $row['topic_title'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<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']), @@ -1143,8 +1143,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($hilit) { // 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']); + $row['post_text'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $row['post_text']); + $row['post_subject'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $row['post_subject']); } $tpl_ary = array( |