diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php
index 316df79319..e5ca547f0b 100644
--- a/phpBB/phpbb/content_visibility.php
+++ b/phpBB/phpbb/content_visibility.php
@@ -145,13 +145,13 @@ class content_visibility
 	public function is_visible($mode, $forum_id, $data)
 	{
 		$visibility = $data[$mode . '_visibility'];
-		$poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id';
+
 		$is_visible = ($visibility == ITEM_APPROVED) ||
-			($this->config['display_unapproved_posts'] &&
-				($this->user->data['user_id'] != ANONYMOUS) &&
-				($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE) &&
-				($this->user->data['user_id'] == $data[$poster_key])) ||
-			 $this->auth->acl_get('m_approve', $forum_id);
+			($this->config['display_unapproved_posts']
+				&& ($this->user->data['user_id'] != ANONYMOUS)#
+				&& ($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE)
+			) ||
+			$this->auth->acl_get('m_approve', $forum_id);
 
 		/**
 		* Allow changing the result of calling is_visible