aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-26 15:11:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-26 15:11:32 +0000
commit5ad7caebc8e0ab08c2d0464d0a561dd562fc5202 (patch)
tree47011e18096eed6264416fe8af907881ea633087 /phpBB/search.php
parentrevert query change which caused boards to halt. (diff)
downloadphpbb-5ad7caebc8e0ab08c2d0464d0a561dd562fc5202.tar.gz
phpbb-5ad7caebc8e0ab08c2d0464d0a561dd562fc5202.tar.bz2
phpbb-5ad7caebc8e0ab08c2d0464d0a561dd562fc5202.zip
group by is required to be correct, but this creates a temporary table. I do not think we will let "new posts" display non-approved posts...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9487 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
-rw-r--r--phpBB/search.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index 80ad756329..6189c359bd 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -378,8 +378,9 @@ if ($keywords || $author || $author_id || $search_id || $submit)
WHERE p.post_time > ' . $user->data['user_lastvisit'] . '
AND t.topic_id = p.topic_id
AND t.topic_moved_id = 0
- ' . $m_approve_fid_sql . '
+ ' . $m_approve_fid_sql . '
' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
+ GROUP BY t.topic_id
$sql_sort";
*/
$field = 'topic_id';