From cc62b68243b9c7866178e1d4a68d141728fe418b Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 29 Sep 2016 01:59:16 +0700 Subject: [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters PHPBB3-14787 --- phpBB/search.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/search.php') diff --git a/phpBB/search.php b/phpBB/search.php index 03575f7e0b..e28ac3fc99 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -690,8 +690,10 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var string show_results String indicating the show results mode * @var string sql_where The SQL WHERE string used by search to get topic data * @var int total_match_count The total number of search matches + * @var array ex_fid_ary Array of excluded forum ids * @since 3.1.7-RC1 * @changed 3.1.10-RC1 Added show_results, sql_where, total_match_count + * @changed 3.1.11-RC1 Added ex_fid_ary */ $vars = array( 'u_search', @@ -699,6 +701,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'show_results', 'sql_where', 'total_match_count', + 'ex_fid_ary', ); extract($phpbb_dispatcher->trigger_event('core.search_modify_url_parameters', compact($vars))); -- cgit v1.2.1 From ae76bfc99e588c14f612738d1abca2312167391d Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 29 Sep 2016 17:18:58 +0700 Subject: [ticket/14801] Highlighting utf8 strings in search results PHPBB3-14801 --- phpBB/search.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/search.php') 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('#(?!<.*)(?]*(?:)#is', '$1', $row['topic_title']); + $row['topic_title'] = preg_replace('#(?!<.*)(?]*(?:)#isu', '$1', $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('#(?!<.*)(?]*(?:)#is', '$1', $row['post_text']); - $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['post_subject']); + $row['post_text'] = preg_replace('#(?!<.*)(?]*(?:)#isu', '$1', $row['post_text']); + $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#isu', '$1', $row['post_subject']); } $tpl_ary = array( -- cgit v1.2.1