diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-10-13 17:37:59 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-10-13 17:37:59 -0500 |
| commit | 397d039ce5c7b61145b4ff8daa41e511a75122c6 (patch) | |
| tree | 4ff1ac2fa9e09a1b1934b7584497e39bb3f4a77b /phpBB/includes | |
| parent | 4392054044d3bf63481098cca9e27e17ae306fa0 (diff) | |
| download | forums-397d039ce5c7b61145b4ff8daa41e511a75122c6.tar forums-397d039ce5c7b61145b4ff8daa41e511a75122c6.tar.gz forums-397d039ce5c7b61145b4ff8daa41e511a75122c6.tar.bz2 forums-397d039ce5c7b61145b4ff8daa41e511a75122c6.tar.xz forums-397d039ce5c7b61145b4ff8daa41e511a75122c6.zip | |
[ticket/11103] Allow global moderators to receive moderator notifications
PHPBB3-11103
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/notification/type/post_in_queue.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/notification/type/topic_in_queue.php | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php index f00a83de36..4f92eb157a 100644 --- a/phpBB/includes/notification/type/post_in_queue.php +++ b/phpBB/includes/notification/type/post_in_queue.php @@ -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 * diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php index 176ec0b901..96f09cef9e 100644 --- a/phpBB/includes/notification/type/topic_in_queue.php +++ b/phpBB/includes/notification/type/topic_in_queue.php @@ -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 * |