aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-11-12 19:27:09 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-11-12 19:27:09 +0100
commit2319748c08539301242e5c5c713c3841b8067e6d (patch)
tree47d78c98ee883282a39e85b699d766efc8f92b0a /phpBB
parent4a1e5df654a31b9670df67ff9f72b209497f3e79 (diff)
parent39f5b82bc3f6a12c559baa13931e60abfeda6562 (diff)
downloadforums-2319748c08539301242e5c5c713c3841b8067e6d.tar
forums-2319748c08539301242e5c5c713c3841b8067e6d.tar.gz
forums-2319748c08539301242e5c5c713c3841b8067e6d.tar.bz2
forums-2319748c08539301242e5c5c713c3841b8067e6d.tar.xz
forums-2319748c08539301242e5c5c713c3841b8067e6d.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/notification/type/report_pm.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
index 6091919769..239805204c 100644
--- a/phpBB/phpbb/notification/type/report_pm.php
+++ b/phpBB/phpbb/notification/type/report_pm.php
@@ -52,7 +52,7 @@ class report_pm extends \phpbb\notification\type\pm
*
* @var string Permission name
*/
- protected $permission = 'm_report';
+ protected $permission = 'm_pm_report';
/**
* Notification option data (for outputting to the user)