| Index: trunk/extensions/CentralAuth/CentralAuthHooks.php |
| — | — | @@ -29,9 +29,7 @@ |
| 30 | 30 | |
| 31 | 31 | wfLoadExtensionMessages('SpecialCentralAuth'); |
| 32 | 32 | $skin = $wgUser->getSkin(); |
| 33 | | - $special = SpecialPage::getTitleFor( 'MergeAccount' ); |
| 34 | 33 | |
| 35 | | - |
| 36 | 34 | // Possible states: |
| 37 | 35 | // - account not merged at all |
| 38 | 36 | // - global accounts exists, but this local account is unattached |
| — | — | @@ -68,17 +66,21 @@ |
| 69 | 67 | $message = wfMsgExt( 'centralauth-prefs-not-managed', 'parseinline' ); |
| 70 | 68 | } |
| 71 | 69 | |
| 72 | | - $manageLink = $skin->makeKnownLinkObj( $special, |
| | 70 | + $manageLinks = array(); |
| | 71 | + $manageLinks[] = $skin->linkKnown( SpecialPage::getTitleFor( 'MergeAccount' ), |
| 73 | 72 | wfMsgExt( 'centralauth-prefs-manage', 'parseinline' ) ); |
| 74 | | - |
| 75 | | - $prefInsert = |
| | 73 | + $manageLinks[] = $skin->linkKnown( SpecialPage::getTitleFor( 'CentralAuth', $wgUser->getName() ), |
| | 74 | + wfMsgExt( 'centralauth-prefs-view', 'parseinline' ) ); |
| | 75 | + $manageLinkList = wfMsg( 'parentheses', $wgLang->pipeList( $manageLinks ) ); |
| | 76 | + |
| | 77 | + $prefInsert = |
| 76 | 78 | array( 'globalaccountstatus' => |
| 77 | 79 | array( |
| 78 | 80 | 'section' => 'personal/info', |
| 79 | 81 | 'label-message' => 'centralauth-prefs-status', |
| 80 | 82 | 'type' => 'info', |
| 81 | 83 | 'raw' => true, |
| 82 | | - 'default' => "$message<br />($manageLink)" |
| | 84 | + 'default' => "$message<br />$manageLinkList" |
| 83 | 85 | ), |
| 84 | 86 | ); |
| 85 | 87 | |
| Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -228,6 +228,7 @@ |
| 229 | 229 | 'centralauth-prefs-count-unattached' => 'Unconfirmed accounts with your name remain on $1 {{PLURAL:$1|project|projects}}.', |
| 230 | 230 | 'centralauth-prefs-detail-unattached' => 'This project site has not been confirmed as belonging to the global account.', |
| 231 | 231 | 'centralauth-prefs-manage' => 'Manage your global account', |
| | 232 | + 'centralauth-prefs-view' => 'View global user info', |
| 232 | 233 | |
| 233 | 234 | // Interaction with Special:Renameuser |
| 234 | 235 | 'centralauth-renameuser-merged' => "User $1 has been migrated to the unified login system. |