diff options
author | n-aleha <nick_aleha@myway.com> | 2014-05-19 03:45:46 +0300 |
---|---|---|
committer | n-aleha <nick_aleha@myway.com> | 2014-08-03 07:03:08 +0300 |
commit | f34bc924a6f16920c215fe6661dbccab1271a722 (patch) | |
tree | 9d4953e8e2f1fabd25a6d0233137f0877de7f96d /phpBB/phpbb/notification | |
parent | ffcf45abf32fc1343fe1d4edfd15828782ab4832 (diff) | |
download | forums-f34bc924a6f16920c215fe6661dbccab1271a722.tar forums-f34bc924a6f16920c215fe6661dbccab1271a722.tar.gz forums-f34bc924a6f16920c215fe6661dbccab1271a722.tar.bz2 forums-f34bc924a6f16920c215fe6661dbccab1271a722.tar.xz forums-f34bc924a6f16920c215fe6661dbccab1271a722.zip |
[ticket/12557] Notification fixes
PHPBB3-12557
Diffstat (limited to 'phpBB/phpbb/notification')
-rw-r--r-- | phpBB/phpbb/notification/manager.php | 4 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/approve_post.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/approve_topic.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/base.php | 3 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/bookmark.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/pm.php | 3 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/post_in_queue.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/quote.php | 3 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/report_pm.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/report_pm_closed.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/report_post.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/report_post_closed.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/topic.php | 1 | ||||
-rw-r--r-- | phpBB/phpbb/notification/type/topic_in_queue.php | 1 |
14 files changed, 19 insertions, 4 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index 74ef980445..5e4bab1530 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -68,12 +68,14 @@ class manager * @param \phpbb\user_loader $user_loader * @param \phpbb\config\config $config * @param \phpbb\db\driver\driver_interface $db + * @param \phpbb\cache\service $cache * @param \phpbb\user $user * @param string $phpbb_root_path * @param string $php_ext * @param string $notification_types_table * @param string $notifications_table * @param string $user_notifications_table + * * @return \phpbb\notification\manager */ public function __construct($notification_types, $notification_methods, ContainerInterface $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) @@ -832,7 +834,7 @@ class manager * Delete all notifications older than a certain time * * @param int $timestamp Unix timestamp to delete all notifications that were created before - * @param bool $only_unread True (default) to only prune read notifications + * @param bool $only_read True (default) to only prune read notifications */ public function prune_notifications($timestamp, $only_read = true) { diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php index a6735dc793..6f0309c5d9 100644 --- a/phpBB/phpbb/notification/type/approve_post.php +++ b/phpBB/phpbb/notification/type/approve_post.php @@ -68,6 +68,7 @@ class approve_post extends \phpbb\notification\type\post * Find the users who want to receive notifications * * @param array $post Data from + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php index 459a0ec348..f4adae6159 100644 --- a/phpBB/phpbb/notification/type/approve_topic.php +++ b/phpBB/phpbb/notification/type/approve_topic.php @@ -68,6 +68,7 @@ class approve_topic extends \phpbb\notification\type\topic * Find the users who want to receive notifications * * @param array $post Data from + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 910f51b3a6..a11ad76db9 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -161,6 +161,8 @@ abstract class base implements \phpbb\notification\type\type_interface * Magic method to set data on this notification * * @param mixed $name + * @param mixed $value + * * @return null */ public function __set($name, $value) @@ -174,7 +176,6 @@ abstract class base implements \phpbb\notification\type\type_interface * * Primarily for testing * - * @param string $name * @return mixed */ public function __toString() diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php index f4870e8a52..6c7efe91cf 100644 --- a/phpBB/phpbb/notification/type/bookmark.php +++ b/phpBB/phpbb/notification/type/bookmark.php @@ -60,6 +60,7 @@ class bookmark extends \phpbb\notification\type\post * Find the users who want to receive notifications * * @param array $post Data from + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/pm.php b/phpBB/phpbb/notification/type/pm.php index 4f54e93e06..89c0337c48 100644 --- a/phpBB/phpbb/notification/type/pm.php +++ b/phpBB/phpbb/notification/type/pm.php @@ -73,6 +73,7 @@ class pm extends \phpbb\notification\type\base * Find the users who want to receive notifications * * @param array $pm Data from + * @param array $options Options for finding users for notification * * @return array */ @@ -178,7 +179,7 @@ class pm extends \phpbb\notification\type\base * Function for preparing the data for insertion in an SQL query * (The service handles insertion) * - * @param array $post Data from submit_post + * @param array $pm Data from submit_post * @param array $pre_create_data Data from pre_create_insert_array() * * @return array Array of data ready to be inserted into the database diff --git a/phpBB/phpbb/notification/type/post_in_queue.php b/phpBB/phpbb/notification/type/post_in_queue.php index b893ad0d15..3bb1028619 100644 --- a/phpBB/phpbb/notification/type/post_in_queue.php +++ b/phpBB/phpbb/notification/type/post_in_queue.php @@ -70,6 +70,7 @@ class post_in_queue extends \phpbb\notification\type\post * Find the users who want to receive notifications * * @param array $post Data from the post + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index 7c61b76b58..b5aa1bded1 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -67,6 +67,7 @@ class quote extends \phpbb\notification\type\post * Find the users who want to receive notifications * * @param array $post Data from + * @param array $options Options for finding users for notification * * @return array */ @@ -122,7 +123,7 @@ class quote extends \phpbb\notification\type\post /** * Update a notification * - * @param array $data Data specific for this type that will be updated + * @param array $post Data specific for this type that will be updated */ public function update_notifications($post) { diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 2eb802eb4b..14a328e104 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -94,6 +94,7 @@ class report_pm extends \phpbb\notification\type\pm * (copied from post_in_queue) * * @param array $post Data from the post + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/report_pm_closed.php b/phpBB/phpbb/notification/type/report_pm_closed.php index ed40df67f3..0db73ad8ad 100644 --- a/phpBB/phpbb/notification/type/report_pm_closed.php +++ b/phpBB/phpbb/notification/type/report_pm_closed.php @@ -53,6 +53,7 @@ class report_pm_closed extends \phpbb\notification\type\pm * Find the users who want to receive notifications * * @param array $pm Data from + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php index 024c8d9d42..bec59df9d5 100644 --- a/phpBB/phpbb/notification/type/report_post.php +++ b/phpBB/phpbb/notification/type/report_post.php @@ -76,6 +76,7 @@ class report_post extends \phpbb\notification\type\post_in_queue * Find the users who want to receive notifications * * @param array $post Data from the post + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php index a979af1fb0..c332588f23 100644 --- a/phpBB/phpbb/notification/type/report_post_closed.php +++ b/phpBB/phpbb/notification/type/report_post_closed.php @@ -60,6 +60,7 @@ class report_post_closed extends \phpbb\notification\type\post * Find the users who want to receive notifications * * @param array $post Data from + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php index a512a12f20..289e45bedb 100644 --- a/phpBB/phpbb/notification/type/topic.php +++ b/phpBB/phpbb/notification/type/topic.php @@ -87,6 +87,7 @@ class topic extends \phpbb\notification\type\base * Find the users who want to receive notifications * * @param array $topic Data from the topic + * @param array $options Options for finding users for notification * * @return array */ diff --git a/phpBB/phpbb/notification/type/topic_in_queue.php b/phpBB/phpbb/notification/type/topic_in_queue.php index 2d54a68648..aef1487d77 100644 --- a/phpBB/phpbb/notification/type/topic_in_queue.php +++ b/phpBB/phpbb/notification/type/topic_in_queue.php @@ -70,6 +70,7 @@ class topic_in_queue extends \phpbb\notification\type\topic * Find the users who want to receive notifications * * @param array $topic Data from the topic + * @param array $options Options for finding users for notification * * @return array */ |