From ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f Mon Sep 17 00:00:00 2001 From: brunoais Date: Wed, 3 Dec 2014 13:53:23 +0000 Subject: [ticket/13146] Fixing what merging broke Merging added content I didn't expect it to add. This fixes back to what it is supposed to be. PHPBB3-13146 --- phpBB/phpbb/content_visibility.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 59d239deeb..655e76a4a8 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -164,8 +164,6 @@ class content_visibility */ public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '') { - global $phpbb_dispatcher; - $where_sql = '('; $approve_forums = array_intersect($forum_ids, array_keys($this->auth->acl_getf('m_approve', true))); @@ -191,11 +189,11 @@ class content_visibility 'approve_forums', 'content_replaced', ); - extract($phpbb_dispatcher->trigger_event('core.phpbb_content_visibility_get_forums_visibility_before', compact($vars))); + extract($this->phpbb_dispatcher->trigger_event('core.phpbb_content_visibility_get_forums_visibility_before', compact($vars))); if ($content_replaced) { - return $where_sql; + return $content_replaced; } -- cgit v1.2.1