1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-07 01:13:53 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-09-28 16:17:57 +02:00
commit 3a9ab9fe69
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 2 additions and 8 deletions
phpBB/phpbb/notification/type

@ -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'],
)));
}

@ -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'],
)));
}