diff options
| author | Andy Chase <asperous2@gmail.com> | 2013-07-22 16:27:07 -0700 |
|---|---|---|
| committer | Andy Chase <asperous2@gmail.com> | 2013-07-22 16:27:07 -0700 |
| commit | be16459b8939d89ff85aa92bc8a804e4489a35bf (patch) | |
| tree | 4b0e5dcc07d3a30c0ecebe98e037b3afc698daf0 /phpBB/search.php | |
| parent | 9d38ded22875e023d4391e7724673087f87fa481 (diff) | |
| parent | c2d919f12d82b4c9c19f170f0c69c9b64d06f855 (diff) | |
| download | forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar.gz forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar.bz2 forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar.xz forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.zip | |
Merge branch 'develop' into ticket/11620
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 2429c81dae..8bcbfc498b 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -366,7 +366,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) { $sql = "SELECT p.post_id FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t - WHERE t.topic_replies = 0 + WHERE t.topic_posts_approved = 1 AND p.topic_id = t.topic_id $last_post_time AND $m_approve_posts_fid_sql @@ -378,7 +378,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) { $sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", p.topic_id FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t - WHERE t.topic_replies = 0 + WHERE t.topic_posts_approved = 1 AND t.topic_moved_id = 0 AND p.topic_id = t.topic_id $last_post_time |