diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-09 10:00:34 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-09 10:00:34 +0200 |
| commit | b1d8f8a22c5be677a0f51299a683965e15b4b4f0 (patch) | |
| tree | e9c94259daddc870fefcc09629969cb6ca20350a /phpBB/phpbb/search/fulltext_mysql.php | |
| parent | 994b9c2c77b34ce2f0a84a2afe84aac62f715dc8 (diff) | |
| parent | 8d54f06d19eb37f48808b9e240c56839b48e2961 (diff) | |
| download | forums-b1d8f8a22c5be677a0f51299a683965e15b4b4f0.tar forums-b1d8f8a22c5be677a0f51299a683965e15b4b4f0.tar.gz forums-b1d8f8a22c5be677a0f51299a683965e15b4b4f0.tar.bz2 forums-b1d8f8a22c5be677a0f51299a683965e15b4b4f0.tar.xz forums-b1d8f8a22c5be677a0f51299a683965e15b4b4f0.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/search/fulltext_mysql.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 9f1aaec7c2..ba9f5f3a77 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -685,6 +685,7 @@ class fulltext_mysql extends \phpbb\search\base * Set to 0 to force a re-count * @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 type Either "posts" or "topics" specifying the type of search being made * @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 * @var string sql_author SQL WHERE condition for the post author ids @@ -697,6 +698,7 @@ class fulltext_mysql extends \phpbb\search\base * @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 bool firstpost_only Wether or not to search only on the first post of the topics + * @var string sql_firstpost The SQL with the conditions to join the tables when using firstpost_only * @var array ex_fid_ary Forum ids that must not be searched on * @var array sql_fora SQL query for ex_fid_ary * @var string m_approve_fid_sql WHERE clause condition on post_visibility restrictions @@ -707,6 +709,7 @@ class fulltext_mysql extends \phpbb\search\base 'result_count', 'sql_sort_table', 'sql_sort_join', + 'type', 'author_ary', 'author_name', 'sql_author', @@ -719,6 +722,7 @@ class fulltext_mysql extends \phpbb\search\base 'sort_days', 'sql_time', 'firstpost_only', + 'sql_firstpost', 'ex_fid_ary', 'sql_fora', 'm_approve_fid_sql', |