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

[ticket/11103] Do not notify yourself when you close your own report

Browse source 
PHPBB3-11103
This commit is contained in:
Nathan Guse 2012-10-16 17:49:54 -05:00
parent 230e9d2e32
commit 92b533aad3
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/notification/type/report_pm_closed.php
View file

@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
} }
/** /**
* Reported post notifications class * Reported pm notifications class
* This class handles notifications for reported pms * This class handles notifications for reported pms
* *
* @package notifications * @package notifications
@ -54,13 +54,18 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
/** /**
* Find the users who want to receive notifications * Find the users who want to receive notifications
* *
* @param array $post Data from * @param array $pm Data from
* *
* @return array * @return array
*/ */
public function find_users_for_notification($post, $options = array()) public function find_users_for_notification($pm, $options = array())
{ {
return array($post['reporter'] => array('')); if ($pm['reporter'] == $this->user->data['user_id'])
{
return array();
}
return array($pm['reporter'] => array(''));
} }
/** /**
@ -123,16 +128,16 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
* Function for preparing the data for insertion in an SQL query * Function for preparing the data for insertion in an SQL query
* (The service handles insertion) * (The service handles insertion)
* *
* @param array $post Data from submit_post * @param array $pm PM Data
* @param array $pre_create_data Data from pre_create_insert_array() * @param array $pre_create_data Data from pre_create_insert_array()
* *
* @return array Array of data ready to be inserted into the database * @return array Array of data ready to be inserted into the database
*/ */
public function create_insert_array($post, $pre_create_data = array()) public function create_insert_array($pm, $pre_create_data = array())
{ {
$this->set_data('closer_id', $post['closer_id']); $this->set_data('closer_id', $pm['closer_id']);
$data = parent::create_insert_array($post, $pre_create_data); $data = parent::create_insert_array($pm, $pre_create_data);
$this->time = $data['time'] = time(); $this->time = $data['time'] = time();

5
phpBB/includes/notification/type/report_post_closed.php
View file

@ -60,6 +60,11 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
*/ */
public function find_users_for_notification($post, $options = array()) public function find_users_for_notification($post, $options = array())
{ {
if ($post['reporter'] == $this->user->data['user_id'])
{
return array();
}
return array($post['reporter'] => array('')); return array($post['reporter'] => array(''));
} }