aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-10-11 10:48:53 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-10-11 10:48:53 +0200
commit8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d (patch)
tree509de1d16752d04171d7fe275a2788976c509c46 /phpBB/install
parentf6f796770a0964589669d97a1c4d79569b900de8 (diff)
parentf6c8338358e5216a62c37bc8ccf252d0e5c6fe0f (diff)
downloadforums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar
forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.gz
forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.bz2
forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.xz
forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/schemas/schema_data.sql3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index d8da6ec395..680341b855 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -358,6 +358,7 @@ INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_soft
# -- Global moderator auth option (not a local option)
INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_ban', 0, 1);
+INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_pm_report', 0, 1);
INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_warn', 0, 1);
# -- Admin related auth options
@@ -545,7 +546,7 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_ban', 'm_chgposter');
# Simple Moderator (m_)
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_delete', 'm_softdelete', 'm_edit', 'm_info', 'm_report');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_delete', 'm_softdelete', 'm_edit', 'm_info', 'm_report', 'm_pm_report');
# Queue Moderator (m_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit');