From 84d302a2fd53e7369d6e4fb6e8218c52fb5d9c75 Mon Sep 17 00:00:00 2001 From: david63 Date: Tue, 2 Jun 2015 16:28:40 +0100 Subject: [PATCH 1/3] [ticket/13899] Add items to core.search_results_modify_search_title PHPBB3-13899 --- phpBB/search.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index 70b7de139d..5265bd784f 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1167,14 +1167,16 @@ if ($keywords || $author || $author_id || $search_id || $submit) * Modify the title and/or load data for the search results page * * @event core.search_results_modify_search_title - * @var int author_id ID of the author to search by - * @var string l_search_title The title of the search page - * @var string search_id Predefined search type name - * @var string show_results Search results output mode - topics or posts - * @var int start The starting id of the results + * @var int author_id ID of the author to search by + * @var string l_search_title The title of the search page + * @var string search_id Predefined search type name + * @var string show_results Search results output mode - topics or posts + * @var int start The starting id of the results * @since 3.1.0-RC4 + * @var int total_match_count The count of search results + * @var string keywords The search keywords */ - $vars = array('author_id', 'l_search_title', 'search_id', 'show_results', 'start'); + $vars = array('author_id', 'l_search_title', 'search_id', 'show_results', 'start', 'total_match_count', 'keywords'); extract($phpbb_dispatcher->trigger_event('core.search_results_modify_search_title', compact($vars))); page_header(($l_search_title) ? $l_search_title : $user->lang['SEARCH']); From 5e7550ee53ca20dd8a949eb105f38e8007116c2c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 22 Jul 2015 19:18:01 +0200 Subject: [PATCH 2/3] [ticket/13899] Fix doc block arrangement and add @changed info PHPBB3-13899 --- phpBB/search.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index 5265bd784f..59e619f70d 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1172,9 +1172,10 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @var string search_id Predefined search type name * @var string show_results Search results output mode - topics or posts * @var int start The starting id of the results - * @since 3.1.0-RC4 * @var int total_match_count The count of search results * @var string keywords The search keywords + * @since 3.1.0-RC4 + * @changed 3.1.6-RC1 Added total_match_count and keywords */ $vars = array('author_id', 'l_search_title', 'search_id', 'show_results', 'start', 'total_match_count', 'keywords'); extract($phpbb_dispatcher->trigger_event('core.search_results_modify_search_title', compact($vars))); From b24ce025267b0d3d4192b27eeb30ebb0f629cf8b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 23 Jul 2015 08:54:13 +0200 Subject: [PATCH 3/3] [ticket/13899] Use multi-line definition for vars array PHPBB3-13899 --- phpBB/search.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index 59e619f70d..d8f0bd1426 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1177,7 +1177,15 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @since 3.1.0-RC4 * @changed 3.1.6-RC1 Added total_match_count and keywords */ - $vars = array('author_id', 'l_search_title', 'search_id', 'show_results', 'start', 'total_match_count', 'keywords'); + $vars = array( + 'author_id', + 'l_search_title', + 'search_id', + 'show_results', + 'start', + 'total_match_count', + 'keywords', + ); extract($phpbb_dispatcher->trigger_event('core.search_results_modify_search_title', compact($vars))); page_header(($l_search_title) ? $l_search_title : $user->lang['SEARCH']);