diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-28 16:17:52 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-28 16:17:52 +0200 |
| commit | b6c230753ee17fe65b43929d4fc10248ea2a23bf (patch) | |
| tree | ac70e87b985c0fddc850d18ec49da1490892a03f /phpBB/phpbb | |
| parent | a85bb1332d2d4660688fe51b9d4622c1eb2c9df5 (diff) | |
| parent | 1af05d961551c0c1210e4b7d709cbbe7c03f8180 (diff) | |
| download | forums-b6c230753ee17fe65b43929d4fc10248ea2a23bf.tar forums-b6c230753ee17fe65b43929d4fc10248ea2a23bf.tar.gz forums-b6c230753ee17fe65b43929d4fc10248ea2a23bf.tar.bz2 forums-b6c230753ee17fe65b43929d4fc10248ea2a23bf.tar.xz forums-b6c230753ee17fe65b43929d4fc10248ea2a23bf.zip | |
Merge pull request #5511 from senky/ticket/15940
[ticket/15940] Expose user_id to notif method's is_available()
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/notification/type/approve_post.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/approve_topic.php | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php index 1e8afec3f9..139b5fabb9 100644 --- a/phpBB/phpbb/notification/type/approve_post.php +++ b/phpBB/phpbb/notification/type/approve_post.php @@ -78,10 +78,7 @@ class approve_post extends \phpbb\notification\type\post 'ignore_users' => array(), ), $options); - $users = 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( + return $this->get_authorised_recipients(array($post['poster_id']), $post['forum_id'], array_merge($options, array( 'item_type' => static::$notification_option['id'], ))); } diff --git a/phpBB/phpbb/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php index f0bbf3f6b0..0c343646ee 100644 --- a/phpBB/phpbb/notification/type/approve_topic.php +++ b/phpBB/phpbb/notification/type/approve_topic.php @@ -78,10 +78,7 @@ class approve_topic extends \phpbb\notification\type\topic 'ignore_users' => array(), ), $options); - $users = 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( + return $this->get_authorised_recipients(array($post['poster_id']), $post['forum_id'], array_merge($options, array( 'item_type' => static::$notification_option['id'], ))); } |