diff options
author | Marc Alexander <admin@m-a-styles.de> | 2014-08-08 16:54:23 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-08 16:54:23 +0200 |
commit | cccd54dde8d2f7733fb44ae6e47f4ec81fa96056 (patch) | |
tree | 6527d19f95e14bf389adb6dad9ce9e4836d6ffcc /phpBB/phpbb/notification/type/approve_post.php | |
parent | 80788980aa7dd4b3a849a43a94569a8b415d96db (diff) | |
download | forums-cccd54dde8d2f7733fb44ae6e47f4ec81fa96056.tar forums-cccd54dde8d2f7733fb44ae6e47f4ec81fa96056.tar.gz forums-cccd54dde8d2f7733fb44ae6e47f4ec81fa96056.tar.bz2 forums-cccd54dde8d2f7733fb44ae6e47f4ec81fa96056.tar.xz forums-cccd54dde8d2f7733fb44ae6e47f4ec81fa96056.zip |
[ticket/12742] Add check for empty $users and add method to fitting methods
The method might now return an empty array in case of an empty users array,
too. The notification types then check if the returned array is empty and
return this if it is empty and if the notification types would otherwise
carry out other operations afterwards.
PHPBB3-12742
Diffstat (limited to 'phpBB/phpbb/notification/type/approve_post.php')
-rw-r--r-- | phpBB/phpbb/notification/type/approve_post.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php index 0aad19d6bf..0e258f34f0 100644 --- a/phpBB/phpbb/notification/type/approve_post.php +++ b/phpBB/phpbb/notification/type/approve_post.php @@ -81,14 +81,7 @@ class approve_post extends \phpbb\notification\type\post $users = array(); $users[$post['poster_id']] = array(''); - $auth_read = $this->auth->acl_get_list(array_keys($users), 'f_read', $post['forum_id']); - - if (empty($auth_read)) - { - return array(); - } - - return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array( + return $this->get_authenticated_recipients(array_keys($users), $post['forum_id'], array_merge($options, array( 'item_type' => self::$notification_option['id'], ))); } |