makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-09-22 21:24:02 +02:00
commit 8c53b369d4
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/search.php
View file

@ -653,14 +653,16 @@ if ($keywords || $author || $author_id || $search_id || $submit)
* @event core.search_modify_url_parameters * @event core.search_modify_url_parameters
* @var string u_search Search URL parameters string * @var string u_search Search URL parameters string
* @var string search_id Predefined search type name * @var string search_id Predefined search type name
* @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 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 int total_match_count The total number of search matches
* @since 3.1.7-RC1 * @since 3.1.7-RC1
* @changed 3.1.10-RC1 Added sql_where, total_match_count * @changed 3.1.10-RC1 Added show_results, sql_where, total_match_count
*/ */
$vars = array( $vars = array(
'u_search', 'u_search',
'search_id', 'search_id',
'show_results',
'sql_where', 'sql_where',
'total_match_count', 'total_match_count',
); );