aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-05-03 00:51:10 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-05-03 00:51:10 -0400
commitc0336988155736583c6fc4398980bd2a4e4036b6 (patch)
tree95b1321adc700e5a497471e10b5732ce07c6a3f2
parenta4a9e380074a8d30cd8d2c80948f86bf594c720e (diff)
parent3a70cb478c2531de31423c7f9006ef1fa746c548 (diff)
downloadforums-c0336988155736583c6fc4398980bd2a4e4036b6.tar
forums-c0336988155736583c6fc4398980bd2a4e4036b6.tar.gz
forums-c0336988155736583c6fc4398980bd2a4e4036b6.tar.bz2
forums-c0336988155736583c6fc4398980bd2a4e4036b6.tar.xz
forums-c0336988155736583c6fc4398980bd2a4e4036b6.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9954] Remove unneeded never permission
-rw-r--r--phpBB/install/schemas/schema_data.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f3259b8fe3..9a29ad7b4d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -569,7 +569,7 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
# No Avatar (u_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group');
-INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar', 'u_masspm', 'u_masspm_group');
+INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar');
# Full Moderator (m_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%';