| Index: trunk/extensions/SharedUserRights/SharedUserRights_body.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | public function userCanExecute( $user ) { |
| 30 | | - return $user->isAllowed( 'userrights-global' ); |
| | 30 | + return $user->isAllowed( 'userrights-shared' ); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | # This might be redundant, but more security is always good. Right? |
| 51 | 51 | if ( !$this->userCanExecute( $wgUser ) ) { |
| 52 | 52 | global $wgOut; |
| 53 | | - $wgOut->permissionRequired( 'userrights-global' ); |
| | 53 | + $wgOut->permissionRequired( 'userrights-shared' ); |
| 54 | 54 | return; |
| 55 | 55 | } |
| 56 | 56 | |
| Index: trunk/extensions/SharedUserRights/SharedUserRights.i18n.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | 'gblrights-logpage' => 'Global Rights Log', |
| 20 | 20 | 'gblrights-pagetext' => 'This is a log of all the changes that are made to the wiki family\'s global rights table', |
| 21 | 21 | 'gblrights-rights-entry' => 'changed global group membership for $1 from $2 to $3', |
| 22 | | - 'right-userrights-global' => 'Manage shared user rights', |
| | 22 | + 'right-userrights-shared' => 'Manage shared user rights', |
| 23 | 23 | ); |
| 24 | 24 | |
| 25 | 25 | /** Message documentation (Message documentation) |
| Index: trunk/extensions/SharedUserRights/SharedUserRights.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | * |
| 8 | 8 | * @author Łukasz 'TOR' Garczewski <tor@wikia-inc.com> |
| 9 | 9 | * @author Charles Melbye <charlie@yourwiki.net> |
| 10 | | -* @version 0.11 |
| | 10 | +* @version 0.12 |
| 11 | 11 | * @copyright Copyright © 2008 Łukasz 'TOR' Garczewski, Wikia, Inc. |
| 12 | 12 | * @copyright Copyright (C) 2008 YourWiki, Inc. |
| 13 | 13 | * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | 'path' => __FILE__, |
| 25 | 25 | 'name' => 'SharedUserRights', |
| 26 | 26 | 'url' => 'http://www.mediawiki.org/wiki/Extension:SharedUserRights', |
| 27 | | - 'version' => '0.11', |
| | 27 | + 'version' => '0.12', |
| 28 | 28 | 'author' => array( "Łukasz 'TOR' Garczewski", 'Charles Melbye' ), |
| 29 | 29 | 'description' => 'Easy global user rights administration', |
| 30 | 30 | 'descriptionmsg' => 'gblrights-desc', |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | |
| 33 | 33 | $dir = dirname( __FILE__ ) . '/'; |
| 34 | 34 | |
| 35 | | -$wgAvailableRights[] = 'userrights-global'; |
| | 35 | +$wgAvailableRights[] = 'userrights-shared'; |
| 36 | 36 | $wgAutoloadClasses['SharedUserRights'] = $dir . 'SharedUserRights_body.php'; |
| 37 | 37 | $wgExtensionMessagesFiles['SharedUserRights'] = $dir . 'SharedUserRights.i18n.php'; |
| 38 | 38 | $wgExtensionAliasesFiles['SharedUserRights'] = $dir . 'SharedUserRights.alias.php'; |
| — | — | @@ -43,7 +43,6 @@ |
| 44 | 44 | $wgLogHeaders['gblrights'] = 'gblrights-pagetext'; |
| 45 | 45 | $wgLogActions['gblrights/rights'] = 'gblrights-rights-entry'; |
| 46 | 46 | |
| 47 | | - |
| 48 | 47 | // Hooked functions |
| 49 | 48 | $wgHooks['UserEffectiveGroups'][] = 'efAddSharedUserRights'; |
| 50 | 49 | |
| — | — | @@ -73,11 +72,11 @@ |
| 74 | 73 | */ |
| 75 | 74 | function efSharedTable( $table ) |
| 76 | 75 | { |
| 77 | | - global $wgSharedDB; |
| | 76 | + global $wgSharedDB; |
| 78 | 77 | |
| 79 | | - if ( !empty( $wgSharedDB ) ) { |
| 80 | | - return "`$wgSharedDB`.`$table`"; |
| 81 | | - } else { |
| 82 | | - return "`$table`"; |
| 83 | | - } |
| | 78 | + if ( !empty( $wgSharedDB ) ) { |
| | 79 | + return "`$wgSharedDB`.`$table`"; |
| | 80 | + } else { |
| | 81 | + return "`$table`"; |
| | 82 | + } |
| 84 | 83 | } |