aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/content_visibility.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/content_visibility.php')
-rw-r--r--phpBB/includes/content_visibility.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 9d2bf34370..a598d863a4 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -82,12 +82,13 @@ class phpbb_content_visibility
* @param $table_alias string - Table alias to prefix in SQL queries
* @return string with the appropriate combination SQL logic for topic/post_visibility
*/
- static public function get_visibility_sql_forums($mode, $forum_ids = array(), $table_alias = '')
+ static public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
{
global $auth, $db, $user;
// users can always see approved posts
- $where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+ $where_sql = "(($table_alias{$mode}_visibility = " . ITEM_APPROVED . '
+ AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids) . ')';
// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
$approve_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_approve', true)));