| Index: trunk/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | 35 | static function onGetPreferences( $user, &$preferences ) { |
| 36 | | - global $wgUser, $wgLang; |
| | 36 | + global $wgLang; |
| 37 | 37 | |
| 38 | 38 | if ( !$user->isAllowed( 'centralauth-merge' ) ) { |
| 39 | 39 | // Not allowed to merge, don't display merge information |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | // - this local account is attached, but migration incomplete |
| 47 | 47 | // - all local accounts are attached |
| 48 | 48 | |
| 49 | | - $global = CentralAuthUser::getInstance( $wgUser ); |
| | 49 | + $global = CentralAuthUser::getInstance( $user ); |
| 50 | 50 | if ( $global->exists() ) { |
| 51 | 51 | if ( $global->isAttached() ) { |
| 52 | 52 | // Local is attached... |
| — | — | @@ -78,7 +78,7 @@ |
| 79 | 79 | $manageLinks = array(); |
| 80 | 80 | $manageLinks[] = Linker::linkKnown( SpecialPage::getTitleFor( 'MergeAccount' ), |
| 81 | 81 | wfMsgExt( 'centralauth-prefs-manage', 'parseinline' ) ); |
| 82 | | - $manageLinks[] = Linker::linkKnown( SpecialPage::getTitleFor( 'CentralAuth', $wgUser->getName() ), |
| | 82 | + $manageLinks[] = Linker::linkKnown( SpecialPage::getTitleFor( 'CentralAuth', $user->getName() ), |
| 83 | 83 | wfMsgExt( 'centralauth-prefs-view', 'parseinline' ) ); |
| 84 | 84 | $manageLinkList = wfMsg( 'parentheses', $wgLang->pipeList( $manageLinks ) ); |
| 85 | 85 | |