diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 11:14:02 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 11:14:02 +0200 |
| commit | 96e212ef0cf91f01cd3027c05d0eea3edcec8d93 (patch) | |
| tree | 2232e9434128c8fd711d0a652539c3d69fded9fe | |
| parent | 3af61075a8f7a82d00bd98b508a48d1396ab76de (diff) | |
| parent | c60497f0091f6b6bbbd046a548c2f81e18ead23a (diff) | |
| download | forums-96e212ef0cf91f01cd3027c05d0eea3edcec8d93.tar forums-96e212ef0cf91f01cd3027c05d0eea3edcec8d93.tar.gz forums-96e212ef0cf91f01cd3027c05d0eea3edcec8d93.tar.bz2 forums-96e212ef0cf91f01cd3027c05d0eea3edcec8d93.tar.xz forums-96e212ef0cf91f01cd3027c05d0eea3edcec8d93.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/phpbb/content_visibility.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 700009da6a..0ba0489cb7 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -237,7 +237,7 @@ class content_visibility if (!sizeof($forum_ids)) { // The user can see all posts/topics in all specified forums - return $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums); + return $where_sql . $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')'; } else { @@ -248,8 +248,8 @@ class content_visibility else { // The user is just a normal user - return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ' - AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true); + return $where_sql . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ' + AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true) . ')'; } $where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ' |