mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 18:50:25 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Allow global moderators to receive moderator notifications

Browse Source 
PHPBB3-11103
This commit is contained in:
Nathaniel Guse 2012-10-13 17:37:59 -05:00
parent 4392054044
commit 397d039ce5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/notification/type/post_in_queue.php
View File

@ -87,13 +87,16 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
'ignore_users' => array(),
), $options);
$auth_approve = $this->auth->acl_get_list(false, $this->permission, $post['forum_id']);
// 0 is for global
$auth_approve = $this->auth->acl_get_list(false, $this->permission, array($post['forum_id'], 0));
if (empty($auth_approve))
{
return array();
}
$auth_approve[$post['forum_id']] = array_unique(array_merge($auth_approve[$post['forum_id']], $auth_approve[0]));
$notify_users = array();
$sql = 'SELECT *

5
phpBB/includes/notification/type/topic_in_queue.php
View File

@ -80,13 +80,16 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
'ignore_users' => array(),
), $options);
$auth_approve = $this->auth->acl_get_list(false, 'm_approve', $topic['forum_id']);
// 0 is for global
$auth_approve = $this->auth->acl_get_list(false, 'm_approve', array($topic['forum_id'], 0));
if (empty($auth_approve))
{
return array();
}
$auth_approve[$topic['forum_id']] = array_unique(array_merge($auth_approve[$topic['forum_id']], $auth_approve[0]));
$notify_users = array();
$sql = 'SELECT *