diff options
| author | brunoais <brunoaiss@gmail.com> | 2014-12-03 13:53:23 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2014-12-03 13:55:53 +0000 |
| commit | ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f (patch) | |
| tree | 5afed3a5b18965fba0a897fbbe753cd2336ac20d /phpBB/phpbb | |
| parent | 80a7f6930cff09d771d0146fbf2eae901def004e (diff) | |
| download | forums-ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f.tar forums-ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f.tar.gz forums-ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f.tar.bz2 forums-ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f.tar.xz forums-ac8a4b05b459a131d7fb6caacb23f190bdfbaf1f.zip | |
[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
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/content_visibility.php | 6 |
1 files changed, 2 insertions, 4 deletions
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; } |