Merge remote-tracking branch 'github/pull/249'

[chef.git] / cookbooks / mediawiki / templates / default / LocalSettings.php.erb

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index b4b0ab65328c177b6d0ae4bc58d89c4aa6ee91cd..ee14cdcd3748e7529e83363c406f95929ca9b875 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -211,7 +211,14 @@ $wgGroupPermissions['*']['createaccount'] = false;
 
 # Since 1.32 MW introduced interface-admin group to separate all UI-related rights. This makes sense for bigger sites,
 # but for OSM it makes more sense to keep group structure simple.  Give all interface-admin rights to sysops.
 
 # Since 1.32 MW introduced interface-admin group to separate all UI-related rights. This makes sense for bigger sites,
 # but for OSM it makes more sense to keep group structure simple.  Give all interface-admin rights to sysops.

-$wgGroupPermissions['sysop'] = array_merge($wgGroupPermissions['sysop'], $wgGroupPermissions['interface-admin']);
+# Also remove the interface-admin group to avoid confusion.
+$wgGroupPermissions['sysop'] = array_merge( $wgGroupPermissions['sysop'], $wgGroupPermissions['interface-admin'] );
+unset( $wgGroupPermissions['interface-admin'] );
+unset( $wgRevokePermissions['interface-admin'] );
+unset( $wgAddGroups['interface-admin'] );
+unset( $wgRemoveGroups['interface-admin'] );
+unset( $wgGroupsAddToSelf['interface-admin'] );
+unset( $wgGroupsRemoveFromSelf['interface-admin'] );

 
 # Restrict access to the upload directory
 $wgUploadPath = "$wgScriptPath/img_auth.php";
 
 # Restrict access to the upload directory
 $wgUploadPath = "$wgScriptPath/img_auth.php";