[ticket/13621] Prepend $where_sql and postpend closing parentheses on return

Prepend $where_sql and postpend closing parentheses on statements with return

PHPBB3-13621
This commit is contained in:
brunoais 2015-02-15 14:20:42 +00:00
parent 9e3bc9a3f9
commit 957b23765f

View file

@ -206,7 +206,7 @@ class content_visibility
if (!sizeof($forum_ids)) if (!sizeof($forum_ids))
{ {
// The user can see all posts/topics in all specified forums // 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 else
{ {
@ -217,8 +217,8 @@ class content_visibility
else else
{ {
// The user is just a normal user // The user is just a normal user
return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ' return $where_sql . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true); AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true) . ')';
} }
$where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ' $where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '