diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 12:47:49 -0700 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 12:47:49 -0700 |
| commit | d8dea6377866be7add5714f842e02011942a9cb4 (patch) | |
| tree | 4380672984674918fa24fe3aac997ae36c4eab9b /phpBB/phpbb | |
| parent | d7a85ebc245e76038b8ccd56524f045cc92a6c13 (diff) | |
| parent | 8928240dc3fefd42d8e98132451e2de92ff7cbec (diff) | |
| download | forums-d8dea6377866be7add5714f842e02011942a9cb4.tar forums-d8dea6377866be7add5714f842e02011942a9cb4.tar.gz forums-d8dea6377866be7add5714f842e02011942a9cb4.tar.bz2 forums-d8dea6377866be7add5714f842e02011942a9cb4.tar.xz forums-d8dea6377866be7add5714f842e02011942a9cb4.zip | |
Merge pull request #9 from igorw/ticket/11574
[ticket/11574] Fix more issues in the updater
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php index 6a31a51201..a89a409dfd 100644 --- a/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php +++ b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php @@ -108,7 +108,7 @@ class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration WHERE user_id = $bot_user_id"; $this->sql_query($sql); - user_delete('remove', $bot_user_id); + user_delete('retain', $bot_user_id); } else { 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)) |