Merge branch '3.2.x'

* 3.2.x: [ticket/15670] Fix SQL error when !f_list_topics and f_read
fededj · Jul 8, 2018 · 28112b7 · 28112b7
2 parents 6d062aa + f5e3394
commit 28112b7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
@@ -506,7 +506,7 @@
 
 		'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',