diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-26 14:53:05 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-26 14:53:05 +0000 |
| commit | a15276a66a7e12ef9f53e5d836fd066f718fdc93 (patch) | |
| tree | 1fa9429c585e9b7af4c1faa5dfd30332ca542541 /phpBB/search.php | |
| parent | b8d5f1640376a341699a4c10c859213013bc5c17 (diff) | |
| download | forums-a15276a66a7e12ef9f53e5d836fd066f718fdc93.tar forums-a15276a66a7e12ef9f53e5d836fd066f718fdc93.tar.gz forums-a15276a66a7e12ef9f53e5d836fd066f718fdc93.tar.bz2 forums-a15276a66a7e12ef9f53e5d836fd066f718fdc93.tar.xz forums-a15276a66a7e12ef9f53e5d836fd066f718fdc93.zip | |
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
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 17 |
1 files 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; |