| Index: trunk/extensions/GlobalUserrights/GlobalUserrights.php |
| — | — | @@ -59,19 +59,19 @@ |
| 60 | 60 | $uid = $user; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | | - $dbw = wfGetDB( DB_MASTER ); |
| | 63 | + $dbr = wfGetDB( DB_MASTER ); |
| 64 | 64 | $groups = array(); |
| 65 | 65 | |
| 66 | | - $res = $dbw->select( 'global_user_groups', |
| | 66 | + $res = $dbr->select( 'global_user_groups', |
| 67 | 67 | array( 'gug_group' ), |
| 68 | 68 | array( 'gug_user' => $uid ) |
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | | - while( $row = $dbw->fetchObject( $res ) ) { |
| | 71 | + while( $row = $dbr->fetchObject( $res ) ) { |
| 72 | 72 | $groups[] = $row->gug_group; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | | - $dbw->freeResult( $res ); |
| | 75 | + $dbr->freeResult( $res ); |
| 76 | 76 | |
| 77 | 77 | return $groups; |
| 78 | 78 | |
| Index: trunk/extensions/GlobalUserrights/global_user_groups.sql |
| — | — | @@ -1,11 +1,11 @@ |
| | 2 | +-- Additional table for the GlobalUserrights extension |
| | 3 | +-- To be added to $wgSharedDB |
| | 4 | +-- replace /*$wgSharedPrefix*/ with $wgSharedPrefix |
| 2 | 5 | |
| 3 | 6 | CREATE TABLE /*$wgSharedPrefix*/global_user_groups ( |
| 4 | | - --- Key to user_id |
| | 7 | + -- Key to user_id |
| 5 | 8 | gug_user int unsigned NOT NULL default '0', |
| 6 | | - --- Group name |
| | 9 | + -- Group name |
| 7 | 10 | gug_group varbinary(16) NOT NULL default '', |
| 8 | 11 | |
| 9 | 12 | PRIMARY KEY (gug_user,gug_group), |
| Index: trunk/extensions/GlobalUserrights/GlobalUserrights.alias.php |
| — | — | @@ -10,7 +10,7 @@ |
| 11 | 11 | |
| 12 | 12 | /** English */ |
| 13 | 13 | $aliases['en'] = array( |
| 14 | | - 'GlobalUserrights' => array( 'GlobalUserRights' ), |
| | 14 | + 'GlobalUserrights' => array( 'GlobalUserRights', 'GlobalGroupMembership' ), |
| 15 | 15 | ); |
| 16 | 16 | |
| 17 | 17 | /** Arabic (العربية) */ |