diff options
| author | Tristan Darricau <tristan.darricau@gmail.com> | 2018-07-08 18:35:29 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@gmail.com> | 2018-07-08 18:35:29 +0200 |
| commit | f5e339455036953a90d6f57b4925c7e0599610a1 (patch) | |
| tree | c99c5aa68dc0c6adfb707ebf5f37285e586b249b | |
| parent | fca72a0f6a3c89d5e4f873e70cb8b557fd4fd8c8 (diff) | |
| parent | 6deae170bd6cec4788e6b056a04fb00957abb39c (diff) | |
| download | forums-f5e339455036953a90d6f57b4925c7e0599610a1.tar forums-f5e339455036953a90d6f57b4925c7e0599610a1.tar.gz forums-f5e339455036953a90d6f57b4925c7e0599610a1.tar.bz2 forums-f5e339455036953a90d6f57b4925c7e0599610a1.tar.xz forums-f5e339455036953a90d6f57b4925c7e0599610a1.zip | |
Merge pull request #5261 from senky/ticket/15670
[ticket/15670] Group forum permission: Can see forum gives NO SQL ERROR
* github.com:/phpbb/phpbb:
[ticket/15670] Fix SQL error when !f_list_topics and f_read
| -rw-r--r-- | phpBB/viewforum.php | 2 |
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', |