diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-17 12:13:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-17 12:13:32 +0200 |
| commit | 7d4bbeef3fcad3379104007acad86239cb67fb44 (patch) | |
| tree | b4c293b01548a6c1ac1735e711a20d78e7592eb3 /phpBB | |
| parent | 3f4abbd5cee8a23ce0ba79981dc6c191f5467d11 (diff) | |
| parent | 3a5336452ca1481c0826bf3ded4a10989995ec77 (diff) | |
| download | forums-7d4bbeef3fcad3379104007acad86239cb67fb44.tar forums-7d4bbeef3fcad3379104007acad86239cb67fb44.tar.gz forums-7d4bbeef3fcad3379104007acad86239cb67fb44.tar.bz2 forums-7d4bbeef3fcad3379104007acad86239cb67fb44.tar.xz forums-7d4bbeef3fcad3379104007acad86239cb67fb44.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/notification/type/bookmark.php
phpBB/phpbb/notification/type/post.php
phpBB/phpbb/notification/type/quote.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/notification/type/approve_post.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/approve_topic.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/bookmark.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/post.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/post_in_queue.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/quote.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/report_pm.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/topic_in_queue.php | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php index 9666647bd8..e4b111e4da 100644 --- a/phpBB/phpbb/notification/type/approve_post.php +++ b/phpBB/phpbb/notification/type/approve_post.php @@ -82,7 +82,7 @@ class approve_post extends \phpbb\notification\type\post $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' => self::$notification_option['id'], + '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 e9f4c32852..f8a3fdec6f 100644 --- a/phpBB/phpbb/notification/type/approve_topic.php +++ b/phpBB/phpbb/notification/type/approve_topic.php @@ -82,7 +82,7 @@ class approve_topic extends \phpbb\notification\type\topic $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' => self::$notification_option['id'], + 'item_type' => static::$notification_option['id'], ))); } diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php index 5b3fc3a1f2..ebbb961c57 100644 --- a/phpBB/phpbb/notification/type/bookmark.php +++ b/phpBB/phpbb/notification/type/bookmark.php @@ -92,7 +92,7 @@ class bookmark extends \phpbb\notification\type\post // Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications $notified_users = $this->notification_manager->get_notified_users($this->get_type(), array( - 'item_parent_id' => self::get_item_parent_id($post), + 'item_parent_id' => static::get_item_parent_id($post), 'read' => 0, )); diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index f3dd6d531a..b16014ff74 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -148,7 +148,7 @@ class post extends \phpbb\notification\type\base // Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications $notified_users = $this->notification_manager->get_notified_users($this->get_type(), array( - 'item_parent_id' => self::get_item_parent_id($post), + 'item_parent_id' => static::get_item_parent_id($post), 'read' => 0, )); diff --git a/phpBB/phpbb/notification/type/post_in_queue.php b/phpBB/phpbb/notification/type/post_in_queue.php index 8b21d77cdd..2d556fc9c8 100644 --- a/phpBB/phpbb/notification/type/post_in_queue.php +++ b/phpBB/phpbb/notification/type/post_in_queue.php @@ -108,7 +108,7 @@ class post_in_queue extends \phpbb\notification\type\post } return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array( - 'item_type' => self::$notification_option['id'], + 'item_type' => static::$notification_option['id'], ))); } diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php index 1cd879579a..2edf37efc7 100644 --- a/phpBB/phpbb/notification/type/quote.php +++ b/phpBB/phpbb/notification/type/quote.php @@ -110,7 +110,7 @@ class quote extends \phpbb\notification\type\post public function update_notifications($post) { $old_notifications = $this->notification_manager->get_notified_users($this->get_type(), array( - 'item_id' => self::get_item_id($post), + 'item_id' => static::get_item_id($post), )); // Find the new users to notify @@ -132,7 +132,7 @@ class quote extends \phpbb\notification\type\post // Remove the necessary notifications if (!empty($remove_notifications)) { - $this->notification_manager->delete_notifications($this->get_type(), self::get_item_id($post), false, $remove_notifications); + $this->notification_manager->delete_notifications($this->get_type(), static::get_item_id($post), false, $remove_notifications); } // return true to continue with the update code in the notifications service (this will update the rest of the notifications) diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 0f7dce0a68..4be4705d05 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -120,7 +120,7 @@ class report_pm extends \phpbb\notification\type\pm } return $this->check_user_notification_options($auth_approve[$post['forum_id']][$this->permission], array_merge($options, array( - 'item_type' => self::$notification_option['id'], + 'item_type' => static::$notification_option['id'], ))); } diff --git a/phpBB/phpbb/notification/type/topic_in_queue.php b/phpBB/phpbb/notification/type/topic_in_queue.php index ad2961525e..2d732b9cd7 100644 --- a/phpBB/phpbb/notification/type/topic_in_queue.php +++ b/phpBB/phpbb/notification/type/topic_in_queue.php @@ -108,7 +108,7 @@ class topic_in_queue extends \phpbb\notification\type\topic } return $this->check_user_notification_options($auth_read[$topic['forum_id']]['f_read'], array_merge($options, array( - 'item_type' => self::$notification_option['id'], + 'item_type' => static::$notification_option['id'], ))); } |