| Index: trunk/phase3/UPGRADE |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | key in $wgGroupPermissions. To emulate the old effect of setting: |
| 48 | 48 | $wgWhitelistAccount['user'] = 0; |
| 49 | 49 | set: |
| 50 | | - $wgGroupPermissions['*'] = array( 'read' ); // without createaccount |
| | 50 | + $wgGroupPermissions['*']['createaccount'] = false; |
| 51 | 51 | |
| 52 | 52 | If $wgWhitelistRead is set, things need to be funked around. This needs work. |
| 53 | 53 | |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1578,7 +1578,8 @@ |
| 1579 | 1579 | $rights = array(); |
| 1580 | 1580 | foreach( $groups as $group ) { |
| 1581 | 1581 | if( isset( $wgGroupPermissions[$group] ) ) { |
| 1582 | | - $rights = array_merge( $rights, $wgGroupPermissions[$group] ); |
| | 1582 | + $rights = array_merge( $rights, |
| | 1583 | + array_keys( array_filter( $wgGroupPermissions[$group] ) ) ); |
| 1583 | 1584 | } |
| 1584 | 1585 | } |
| 1585 | 1586 | return $rights; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -679,19 +679,38 @@ |
| 680 | 680 | * combined with the permissions of all groups that a given user is listed |
| 681 | 681 | * in in the user_groups table. |
| 682 | 682 | */ |
| 683 | | -$wgGroupPermissions = array( |
| 684 | | - '*' => array( 'read', 'createaccount' ), |
| 685 | | - 'user' => array( 'read', 'move' ), |
| 686 | | - |
| 687 | | - 'bot' => array( 'bot' ), |
| 688 | | - 'sysop' => array( 'createaccount', 'patrol', 'protect', 'delete', |
| 689 | | - 'rollback', 'block', 'editinterface' ), |
| 690 | | - 'bureaucrat' => array( 'userrights' ), |
| 691 | | - 'developer' => array( 'siteadmin' ), |
| 692 | | -); |
| | 683 | +$wgGroupPermissions = array(); |
| 693 | 684 | |
| | 685 | +$wgGroupPermissions['*' ]['createaccount'] = true; |
| | 686 | +$wgGroupPermissions['*' ]['read'] = true; |
| 694 | 687 | |
| | 688 | +$wgGroupPermissions['user' ]['move'] = true; |
| | 689 | +$wgGroupPermissions['user' ]['read'] = true; |
| 695 | 690 | |
| | 691 | +$wgGroupPermissions['bot' ]['bot'] = true; |
| | 692 | + |
| | 693 | +$wgGroupPermissions['sysop']['block'] = true; |
| | 694 | +$wgGroupPermissions['sysop']['createaccount'] = true; |
| | 695 | +$wgGroupPermissions['sysop']['delete'] = true; |
| | 696 | +$wgGroupPermissions['sysop']['editinterface'] = true; |
| | 697 | +$wgGroupPermissions['sysop']['import'] = true; |
| | 698 | +$wgGroupPermissions['sysop']['importraw'] = true; |
| | 699 | +$wgGroupPermissions['sysop']['patrol'] = true; |
| | 700 | +$wgGroupPermissions['sysop']['protect'] = true; |
| | 701 | +$wgGroupPermissions['sysop']['rollback'] = true; |
| | 702 | + |
| | 703 | +$wgGroupPermissions['bureaucrat']['userrights'] = true; |
| | 704 | + |
| | 705 | +/** |
| | 706 | + * The developer group is deprecated, but can be activated if need be |
| | 707 | + * to use the 'lockdb' and 'unlockdb' special pages. Those require |
| | 708 | + * that a lock file be defined and creatable/removable by the web |
| | 709 | + * server. |
| | 710 | + */ |
| | 711 | +# $wgGroupPermissions['developer']['siteadmin'] = true; |
| | 712 | + |
| | 713 | + |
| | 714 | + |
| 696 | 715 | # Proxy scanner settings |
| 697 | 716 | # |
| 698 | 717 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -298,6 +298,8 @@ |
| 299 | 299 | * (bug 2277) Added Friulian language file |
| 300 | 300 | * Less gratuitous munging of content sample in delete summary |
| 301 | 301 | * badaccess/badaccesstext to supercede sysop*, developer* messages |
| | 302 | +* Changed $wgGroupPermissions to more cut-n-paste-friendly format |
| | 303 | +* 'developer' group deprecated by default |
| 302 | 304 | |
| 303 | 305 | |
| 304 | 306 | === Caveats === |
