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 | 89a564adb22fda151e8d3c1f0e5eacdbf624d63a (patch) | |
| tree | b5c2fdc01b54f726eab950688a54654484671f4f /phpBB/search.php | |
| parent | 5075090d4fa4e3f8340f6f9d19851046122f6dc7 (diff) | |
| parent | b4e673acc1ec5da11666277f340ac579e054b608 (diff) | |
| download | forums-89a564adb22fda151e8d3c1f0e5eacdbf624d63a.tar forums-89a564adb22fda151e8d3c1f0e5eacdbf624d63a.tar.gz forums-89a564adb22fda151e8d3c1f0e5eacdbf624d63a.tar.bz2 forums-89a564adb22fda151e8d3c1f0e5eacdbf624d63a.tar.xz forums-89a564adb22fda151e8d3c1f0e5eacdbf624d63a.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14801] Highlighting utf8 strings in search results
Diffstat (limited to 'phpBB/search.php')
| -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 4e722dda56..07779353b7 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1063,7 +1063,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']), @@ -1146,8 +1146,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( |