From a15276a66a7e12ef9f53e5d836fd066f718fdc93 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 26 Apr 2009 14:53:05 +0000
Subject: [PATCH] revert query change which caused boards to halt.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9486 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/search.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index 7192127e5a..80ad756329 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -365,14 +365,23 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				}
 				else
 				{
- 					$sql = 'SELECT t.topic_id
+					$sql = 'SELECT t.topic_id
+						FROM ' . TOPICS_TABLE . ' t
+						WHERE t.topic_last_post_time > ' . $user->data['user_lastvisit'] . '
+							AND t.topic_moved_id = 0
+							' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
+							' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
+						$sql_sort";
+/*
+					$sql = 'SELECT t.topic_id
 						FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
 						WHERE p.post_time > ' . $user->data['user_lastvisit'] . '
 							AND t.topic_id = p.topic_id
- 							AND t.topic_moved_id = 0
+							AND t.topic_moved_id = 0
 							' .  $m_approve_fid_sql . '
- 							' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
- 						$sql_sort";
+							' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
+						$sql_sort";
+*/
 					$field = 'topic_id';
 				}
 			break;