diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-02-15 14:20:42 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-02-15 18:50:13 +0000 |
| commit | 957b23765f60f1f4d3a2cdb660cfb48024b88ece (patch) | |
| tree | 583af3af01f9f7a3ab0b7a151801cdc0542604cb /phpBB/phpbb/content_visibility.php | |
| parent | 9e3bc9a3f99d9a29702e4f8e45480ffd7f1c8003 (diff) | |
| download | forums-957b23765f60f1f4d3a2cdb660cfb48024b88ece.tar forums-957b23765f60f1f4d3a2cdb660cfb48024b88ece.tar.gz forums-957b23765f60f1f4d3a2cdb660cfb48024b88ece.tar.bz2 forums-957b23765f60f1f4d3a2cdb660cfb48024b88ece.tar.xz forums-957b23765f60f1f4d3a2cdb660cfb48024b88ece.zip | |
[ticket/13621] Prepend $where_sql and postpend closing parentheses on return
Prepend $where_sql and postpend closing parentheses on statements with return
PHPBB3-13621
Diffstat (limited to 'phpBB/phpbb/content_visibility.php')
| -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 c8516d6c85..ec73abc721 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -206,7 +206,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 { @@ -217,8 +217,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 . ' |