aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Senko <jakubsenko@gmail.com>2018-06-18 18:38:53 +0200
committerJakub Senko <jakubsenko@gmail.com>2018-06-18 18:38:53 +0200
commit6deae170bd6cec4788e6b056a04fb00957abb39c (patch)
tree5e7407b1b64bdb31425140b7fff99e165d2484da
parent02cbb864a5b6df62e978a69c368c8ec5ca35d8a3 (diff)
downloadforums-6deae170bd6cec4788e6b056a04fb00957abb39c.tar
forums-6deae170bd6cec4788e6b056a04fb00957abb39c.tar.gz
forums-6deae170bd6cec4788e6b056a04fb00957abb39c.tar.bz2
forums-6deae170bd6cec4788e6b056a04fb00957abb39c.tar.xz
forums-6deae170bd6cec4788e6b056a04fb00957abb39c.zip
[ticket/15670] Fix SQL error when !f_list_topics and f_read
PHPBB3-15670
-rw-r--r--phpBB/viewforum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 04a39e83d5..416ffe3d90 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -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',