mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-26 13:18:54 +00:00
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
This commit is contained in:
parent
b8d5f16403
commit
a15276a66a
1 changed files with 13 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue