mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-05 08:23:28 +02:00
Merge branch '3.2.x'
* 3.2.x: [ticket/15670] Fix SQL error when !f_list_topics and f_read
This commit is contained in:
commit
28112b7b77
@ -506,7 +506,7 @@ if ($forum_data['forum_type'] == FORUM_POST)
|
||||
|
||||
'WHERE' => '(t.forum_id = ' . $forum_id . '
|
||||
AND t.topic_type = ' . POST_ANNOUNCE . ') OR
|
||||
(' . $db->sql_in_set('t.forum_id', $g_forum_ary) . '
|
||||
(' . $db->sql_in_set('t.forum_id', $g_forum_ary, false, true) . '
|
||||
AND t.topic_type = ' . POST_GLOBAL . ')',
|
||||
|
||||
'ORDER_BY' => 't.topic_time DESC',
|
||||
|
Loading…
x
Reference in New Issue
Block a user