aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/notification
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb/notification')
-rw-r--r--phpBB/phpbb/notification/type/approve_post.php7
-rw-r--r--phpBB/phpbb/notification/type/approve_topic.php7
-rw-r--r--phpBB/phpbb/notification/type/base.php4
-rw-r--r--phpBB/phpbb/notification/type/post.php2
-rw-r--r--phpBB/phpbb/notification/type/topic.php2
-rw-r--r--phpBB/phpbb/notification/type/type_interface.php2
6 files changed, 9 insertions, 15 deletions
diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php
index e4b111e4da..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'],
)));
}
@@ -94,7 +91,7 @@ class approve_post extends \phpbb\notification\type\post
*
* @param array $post Post data from submit_post
* @param array $notify_users Notify users list
- * Formated from find_users_for_notification()
+ * Formatted from find_users_for_notification()
* @return array Whatever you want to send to create_insert_array().
*/
public function pre_create_insert_array($post, $notify_users)
diff --git a/phpBB/phpbb/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php
index f8a3fdec6f..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'],
)));
}
@@ -94,7 +91,7 @@ class approve_topic extends \phpbb\notification\type\topic
*
* @param array $post Post data from submit_post
* @param array $notify_users Notify users list
- * Formated from find_users_for_notification()
+ * Formatted from find_users_for_notification()
* @return array Whatever you want to send to create_insert_array().
*/
public function pre_create_insert_array($post, $notify_users)
diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index 77ed7f2b09..e4600add11 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -336,7 +336,7 @@ abstract class base implements \phpbb\notification\type\type_interface
}
/**
- * Get the reference of the notifcation (fall back)
+ * Get the reference of the notification (fall back)
*
* @return string
*/
@@ -356,7 +356,7 @@ abstract class base implements \phpbb\notification\type\type_interface
}
/**
- * Get the reason for the notifcation (fall back)
+ * Get the reason for the notification (fall back)
*
* @return string
*/
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index 254f4c07b3..f0e938d3ce 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -352,7 +352,7 @@ class post extends \phpbb\notification\type\base
*
* @param array $post Post data from submit_post
* @param array $notify_users Notify users list
- * Formated from find_users_for_notification()
+ * Formatted from find_users_for_notification()
* @return array Whatever you want to send to create_insert_array().
*/
public function pre_create_insert_array($post, $notify_users)
diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php
index 5c42afa8c8..2535cdaed6 100644
--- a/phpBB/phpbb/notification/type/topic.php
+++ b/phpBB/phpbb/notification/type/topic.php
@@ -256,7 +256,7 @@ class topic extends \phpbb\notification\type\base
*
* @param array $post Post data from submit_post
* @param array $notify_users Notify users list
- * Formated from find_users_for_notification()
+ * Formatted from find_users_for_notification()
* @return array Whatever you want to send to create_insert_array().
*/
public function pre_create_insert_array($post, $notify_users)
diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php
index f9f832bdda..ed77335ce5 100644
--- a/phpBB/phpbb/notification/type/type_interface.php
+++ b/phpBB/phpbb/notification/type/type_interface.php
@@ -170,7 +170,7 @@ interface type_interface
*
* @param array $type_data The type specific data
* @param array $notify_users Notify users list
- * Formated from find_users_for_notification()
+ * Formatted from find_users_for_notification()
* @return array Whatever you want to send to create_insert_array().
*/
public function pre_create_insert_array($type_data, $notify_users);