diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-08-08 22:22:58 +0100 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-08-08 22:23:17 +0100 |
| commit | 84a40b6ad1bc409f8ad642292a0ec729e38993fb (patch) | |
| tree | 69975f839b5fd542bb5af9861e41ab99b231d8fd /phpBB/phpbb/search/fulltext_native.php | |
| parent | 8e80425c821d4ab2e3a40a0f2efb64b077563d3a (diff) | |
| download | forums-84a40b6ad1bc409f8ad642292a0ec729e38993fb.tar forums-84a40b6ad1bc409f8ad642292a0ec729e38993fb.tar.gz forums-84a40b6ad1bc409f8ad642292a0ec729e38993fb.tar.bz2 forums-84a40b6ad1bc409f8ad642292a0ec729e38993fb.tar.xz forums-84a40b6ad1bc409f8ad642292a0ec729e38993fb.zip | |
[ticket/14082] Fix wrong variables from previous commit
Fixing variables wrongly attributed in PHPBB3-13686
PHPBB3-14082
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 c2cae3b37e..7c825029fb 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -733,9 +733,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 @@ -748,7 +749,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 @@ -761,8 +762,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', |