diff options
author | Marc Alexander <admin@m-a-styles.de> | 2015-08-09 09:56:40 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-09 09:56:40 +0200 |
commit | 994b9c2c77b34ce2f0a84a2afe84aac62f715dc8 (patch) | |
tree | d35f0340ffc7ad0e592da6fd973d2f959ac008de /phpBB/phpbb/search/fulltext_native.php | |
parent | e41fcab3de8f3ac55e07b857a967923bc61ae4df (diff) | |
parent | 4d2940dd2ffd773fbf3348f5adecbb8612b49636 (diff) | |
download | forums-994b9c2c77b34ce2f0a84a2afe84aac62f715dc8.tar forums-994b9c2c77b34ce2f0a84a2afe84aac62f715dc8.tar.gz forums-994b9c2c77b34ce2f0a84a2afe84aac62f715dc8.tar.bz2 forums-994b9c2c77b34ce2f0a84a2afe84aac62f715dc8.tar.xz forums-994b9c2c77b34ce2f0a84a2afe84aac62f715dc8.zip |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/search/fulltext_native.php')
-rw-r--r-- | phpBB/phpbb/search/fulltext_native.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 43f399eb13..bb3057fd14 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -736,9 +736,10 @@ class fulltext_native extends \phpbb\search\base * @var array must_not_contain_ids Ids that cannot be taken into account for the results * @var array must_exclude_one_ids Ids that cannot be on the results * @var array must_contain_ids Ids that must be on the results - * @var int result_count 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 - * @var bool join_topic Weather or not TOPICS_TABLE should be CROSS JOIN'ED + * @var array sql_array The data on how to search in the DB at this point + * @var bool left_join_topics Whether or not TOPICS_TABLE should be CROSS JOIN'ED * @var array author_ary Array of user_id containing the users to filter the results to * @var string author_name An extra username to search on (!empty(author_ary) must be true, to be relevant) * @var array ex_fid_ary Which forums not to search on @@ -751,7 +752,7 @@ class fulltext_native extends \phpbb\search\base * @var string sql_where An array of the current WHERE clause conditions * @var string sql_match Which columns to do the search on * @var string sql_match_where Extra conditions to use to properly filter the matching process - * @var string group_by Whether or not the SQL query requires a GROUP BY for the elements in the SELECT clause + * @var bool group_by Whether or not the SQL query requires a GROUP BY for the elements in the SELECT clause * @var string sort_by_sql The possible predefined sort types * @var string sort_key The sort type used from the possible sort types * @var string sort_dir "a" for ASC or "d" dor DESC for the sort order used @@ -764,8 +765,9 @@ class fulltext_native extends \phpbb\search\base 'must_not_contain_ids', 'must_exclude_one_ids', 'must_contain_ids', - 'result_count', - 'join_topic', + 'total_results', + 'sql_array', + 'left_join_topics', 'author_ary', 'author_name', 'ex_fid_ary', |