diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 15:27:25 -0400 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 15:27:25 -0400 |
| commit | c2b31ca1015872126b40fce5404da7216b8595c6 (patch) | |
| tree | 2383bab3e51ec21d220e91f0020bfb3ff43cec2b /phpBB/phpbb | |
| parent | f6865dc33a8cedb7d21a64401ed80d2edbac36bd (diff) | |
| parent | af693493985ca32faba4850f7fe060213f404f37 (diff) | |
| download | forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar.gz forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar.bz2 forums-c2b31ca1015872126b40fce5404da7216b8595c6.tar.xz forums-c2b31ca1015872126b40fce5404da7216b8595c6.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop:
[ticket/11704] Use the correct directory for dependency checking.
[ticket/11704] Correctly escape "
[ticket/11697] author_search() used incorrect parameter
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 7dc4da8ffe..a1e1b089b9 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -542,7 +542,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base * @param int $per_page number of ids each page is supposed to contain * @return boolean|int total number of results */ - public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page) + public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page) { // No author? No posts if (!sizeof($author_ary)) |