makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php
This commit is contained in:
Marc Alexander 2015-10-17 12:13:32 +02:00
commit 7d4bbeef3f
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/notification/type/approve_post.php
View file

@ -82,7 +82,7 @@ class approve_post extends \phpbb\notification\type\post
$users[$post['poster_id']] = $this->notification_manager->get_default_methods(); $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_keys($users), $post['forum_id'], array_merge($options, array(
'item_type' => self::$notification_option['id'], 'item_type' => static::$notification_option['id'],
))); )));
} }

2
phpBB/phpbb/notification/type/approve_topic.php
View file

@ -82,7 +82,7 @@ class approve_topic extends \phpbb\notification\type\topic
$users[$post['poster_id']] = $this->notification_manager->get_default_methods(); $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_keys($users), $post['forum_id'], array_merge($options, array(
'item_type' => self::$notification_option['id'], 'item_type' => static::$notification_option['id'],
))); )));
} }

2
phpBB/phpbb/notification/type/bookmark.php
View file

@ -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 // 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( $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, 'read' => 0,
)); ));

2
phpBB/phpbb/notification/type/post.php
View file

@ -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 // 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( $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, 'read' => 0,
)); ));

2
phpBB/phpbb/notification/type/post_in_queue.php
View file

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

4
phpBB/phpbb/notification/type/quote.php
View file

@ -110,7 +110,7 @@ class quote extends \phpbb\notification\type\post
public function update_notifications($post) public function update_notifications($post)
{ {
$old_notifications = $this->notification_manager->get_notified_users($this->get_type(), array( $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 // Find the new users to notify
@ -132,7 +132,7 @@ class quote extends \phpbb\notification\type\post
// Remove the necessary notifications // Remove the necessary notifications
if (!empty($remove_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) // return true to continue with the update code in the notifications service (this will update the rest of the notifications)

2
phpBB/phpbb/notification/type/report_pm.php
View file

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

2
phpBB/phpbb/notification/type/topic_in_queue.php
View file

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