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

Merge branch '3.1.x'

Browse source
This commit is contained in:
Marc Alexander 2015-08-22 10:37:53 +02:00
commit f2edec90b0
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/search/fulltext_native.php
View file

@ -1053,6 +1053,7 @@ class fulltext_native extends \phpbb\search\base
* @event core.search_native_author_count_query_before * @event core.search_native_author_count_query_before
* @var int total_results The previous result count for the format of the query. * @var int total_results The previous result count for the format of the query.
* Set to 0 to force a re-count * Set to 0 to force a re-count
* @var string type The type of search being made
* @var string select SQL SELECT clause for what to get * @var string select SQL SELECT clause for what to get
* @var string sql_sort_table CROSS JOIN'ed table to allow doing the sort chosen * @var string sql_sort_table CROSS JOIN'ed table to allow doing the sort chosen
* @var string sql_sort_join Condition to define how to join the CROSS JOIN'ed table specifyed in sql_sort_table * @var string sql_sort_join Condition to define how to join the CROSS JOIN'ed table specifyed in sql_sort_table
@ -1065,6 +1066,7 @@ class fulltext_native extends \phpbb\search\base
* @var string sort_days Time, in days, that the oldest post showing can have * @var string sort_days Time, in days, that the oldest post showing can have
* @var string sql_time The SQL to search on the time specifyed by sort_days * @var string sql_time The SQL to search on the time specifyed by sort_days
* @var bool firstpost_only Wether or not to search only on the first post of the topics * @var bool firstpost_only Wether or not to search only on the first post of the topics
* @var string sql_firstpost The SQL used in the WHERE claused to filter by firstpost.
* @var array ex_fid_ary Forum ids that must not be searched on * @var array ex_fid_ary Forum ids that must not be searched on
* @var array sql_fora SQL query for ex_fid_ary * @var array sql_fora SQL query for ex_fid_ary
* @var int start How many posts to skip in the search results (used for pagination) * @var int start How many posts to skip in the search results (used for pagination)
@ -1072,6 +1074,7 @@ class fulltext_native extends \phpbb\search\base
*/ */
$vars = array( $vars = array(
'total_results', 'total_results',
'type',
'select', 'select',
'sql_sort_table', 'sql_sort_table',
'sql_sort_join', 'sql_sort_join',
@ -1084,6 +1087,7 @@ class fulltext_native extends \phpbb\search\base
'sort_days', 'sort_days',
'sql_time', 'sql_time',
'firstpost_only', 'firstpost_only',
'sql_firstpost',
'ex_fid_ary', 'ex_fid_ary',
'sql_fora', 'sql_fora',
'start', 'start',