mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 10:05:19 +02:00
Code Issues Releases Wiki Activity

[ticket/13146] Fixing what merging broke

Browse Source 
Merging added content I didn't expect it to add. This fixes back to what it is supposed to be.

PHPBB3-13146
This commit is contained in:
brunoais 2014-12-03 13:53:23 +00:00
parent 80a7f6930c
commit ac8a4b05b4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/content_visibility.php
View File

@ -164,8 +164,6 @@ class content_visibility
*/ */
public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '') public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
{ {
global $phpbb_dispatcher;
$where_sql = '('; $where_sql = '(';
$approve_forums = array_intersect($forum_ids, array_keys($this->auth->acl_getf('m_approve', true))); $approve_forums = array_intersect($forum_ids, array_keys($this->auth->acl_getf('m_approve', true)));
@ -191,11 +189,11 @@ class content_visibility
'approve_forums', 'approve_forums',
'content_replaced', '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) if ($content_replaced)
{ {
return $where_sql; return $content_replaced;
} }