diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt index 35b3e67f9e..5ac9a8f878 100644 --- a/phpBB/language/en/email/report_closed.txt +++ b/phpBB/language/en/email/report_closed.txt @@ -2,7 +2,7 @@ Subject: Report closed - "{POST_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" in "{TOPIC_TITLE}" topic at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. +You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. You can view your reported post by clicking on the following link: diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php index 9e7f524954..0b2054b259 100644 --- a/phpBB/phpbb/notification/type/report_pm.php +++ b/phpBB/phpbb/notification/type/report_pm.php @@ -84,11 +84,10 @@ class report_pm extends \phpbb\notification\type\pm */ public function is_available() { - return !empty($this->auth->acl_get($this->permission)) && - $this->config['allow_pm_report']; + return $this->config['allow_pm_report'] && + !empty($this->auth->acl_get($this->permission)); } - /** * Find the users who want to receive notifications * (copied from post_in_queue)