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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-09-28 16:17:57 +02:00
parent f4462bdfd6 b6c230753e
commit 3a9ab9fe69
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/notification/type/approve_post.php
View File

@@ -78,10 +78,7 @@ class approve_post extends \phpbb\notification\type\post
'ignore_users' => array(), 'ignore_users' => array(),
), $options); ), $options);
$users = array(); return $this->get_authorised_recipients(array($post['poster_id']), $post['forum_id'], array_merge($options, array(
$users[$post['poster_id']] = $this->notification_manager->get_default_methods();
return $this->get_authorised_recipients(array_keys($users), $post['forum_id'], array_merge($options, array(
'item_type' => static::$notification_option['id'], 'item_type' => static::$notification_option['id'],
))); )));
} }

5
phpBB/phpbb/notification/type/approve_topic.php
View File

@@ -78,10 +78,7 @@ class approve_topic extends \phpbb\notification\type\topic
'ignore_users' => array(), 'ignore_users' => array(),
), $options); ), $options);
$users = array(); return $this->get_authorised_recipients(array($post['poster_id']), $post['forum_id'], array_merge($options, array(
$users[$post['poster_id']] = $this->notification_manager->get_default_methods();
return $this->get_authorised_recipients(array_keys($users), $post['forum_id'], array_merge($options, array(
'item_type' => static::$notification_option['id'], 'item_type' => static::$notification_option['id'],
))); )));
} }