diff options
author | Tristan Darricau <github@nicofuma.fr> | 2016-09-18 21:25:17 +0200 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2016-09-18 21:25:17 +0200 |
commit | e0d9f2aad6239cb0aca89ff93cd94eb974ce7eeb (patch) | |
tree | 78cdaaca679977ddd8bb7f14a6c61e8b3666c60c /phpBB/search.php | |
parent | 19bbbfe0f3e9898f2ee8d8d392ecf2584dafce86 (diff) | |
parent | 4da479d47f2000265abd2f908665162f8176ea7e (diff) | |
download | forums-e0d9f2aad6239cb0aca89ff93cd94eb974ce7eeb.tar forums-e0d9f2aad6239cb0aca89ff93cd94eb974ce7eeb.tar.gz forums-e0d9f2aad6239cb0aca89ff93cd94eb974ce7eeb.tar.bz2 forums-e0d9f2aad6239cb0aca89ff93cd94eb974ce7eeb.tar.xz forums-e0d9f2aad6239cb0aca89ff93cd94eb974ce7eeb.zip |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14787] Add more parameters to the core.search_modify_url_parameters
Diffstat (limited to 'phpBB/search.php')
-rw-r--r-- | phpBB/search.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 2d8a0ad7c7..fdd4aec7ae 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -648,11 +648,16 @@ if ($keywords || $author || $author_id || $search_id || $submit) * @event core.search_modify_url_parameters * @var string u_search Search URL parameters string * @var string search_id Predefined search type name + * @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 * @since 3.1.7-RC1 + * @changed 3.1.10-RC1 Added sql_where, total_match_count */ $vars = array( 'u_search', 'search_id', + 'sql_where', + 'total_match_count', ); extract($phpbb_dispatcher->trigger_event('core.search_modify_url_parameters', compact($vars))); |