3 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php
index 2e1589d999..aeb5abcc83 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -755,7 +755,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 		$sql = 'SELECT topic_id, topic_last_post_time
 			FROM ' . TOPICS_TABLE . '
 			WHERE topic_moved_id = 0
-				AND ' . phpbb_content_visibility::get_visibility_sql_forums('topic', $forum_ids) . '
+				AND ' . phpbb_content_visibility::get_forums_visibility_sql('topic', $forum_ids) . '
 			ORDER BY topic_last_post_time DESC';
 		$result = $db->sql_query_limit($sql, $this->num_items);
 
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)));
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 2781f1a7bb..5849f5cf4c 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1003,7 +1003,7 @@ function display_user_activity(&$userdata)
 		FROM ' . POSTS_TABLE . '
 		WHERE poster_id = ' . $userdata['user_id'] . '
 			AND post_postcount = 1
-			AND ' . phpbb_content_visibility::get_visibility_sql_forums('post', $forum_ary) . '
+			AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
 		GROUP BY forum_id
 		ORDER BY num_posts DESC';
 	$result = $db->sql_query_limit($sql, 1);
@@ -1029,7 +1029,7 @@ function display_user_activity(&$userdata)
 		FROM ' . POSTS_TABLE . '
 		WHERE poster_id = ' . $userdata['user_id'] . '
 			AND post_postcount = 1
-			AND ' . phpbb_content_visibility::get_visibility_sql_forums('post', $forum_ary) . '
+			AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
 		GROUP BY topic_id
 		ORDER BY num_posts DESC';
 	$result = $db->sql_query_limit($sql, 1);