| Index: trunk/extensions/CentralAuth/specials/SpecialMergeAccount.php |
| — | — | @@ -16,7 +16,9 @@ |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | if ( !$wgUser->isLoggedIn() ) { |
| 20 | | - $wgOut->addWikiMsg( 'centralauth-merge-notlogged' ); |
| | 20 | + $loginpage = SpecialPage::getTitleFor( 'Userlogin' ); |
| | 21 | + $loginurl = $loginpage->getFullUrl( array( 'returnto' => $this->getTitle->getPrefixedText() ) ); |
| | 22 | + $wgOut->addWikiMsg( 'centralauth-merge-notlogged', $loginurl ); |
| 21 | 23 | $wgOut->addWikiMsg( 'centralauth-readmore-text' ); |
| 22 | 24 | |
| 23 | 25 | return; |
| Index: trunk/extensions/CentralAuth/CentralAuth.i18n.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | 'centralauth-desc' => '[[Special:MergeAccount|Merge account]] across wikis of {{int:Centralauth-groupname}}', |
| 20 | 20 | 'centralauth-mergeaccount-desc' => '[[Special:MergeAccount|Merges multiple accounts]] for Single User Login', |
| 21 | 21 | 'centralauth-merge-denied' => 'Sorry, you do not have permission to access this page.', |
| 22 | | - 'centralauth-merge-notlogged' => 'Please <span class="plainlinks">[{{fullurl:{{#special:UserLogin}}|returnto={{urlencode:{{#special:MergeAccount}}|WIKI}}}} log in]</span> to check if your accounts have been fully merged.', |
| | 22 | + 'centralauth-merge-notlogged' => 'Please <span class="plainlinks">[$1 log in]</span> to check if your accounts have been fully merged.', |
| 23 | 23 | 'centralauth-merge-welcome' => "'''Your user account has not yet been migrated to the unified login system of {{int:Centralauth-groupname}}.''' |
| 24 | 24 | |
| 25 | 25 | If you choose to migrate your accounts, you will be able to use the same username and password to log in to all wikis of {{int:Centralauth-groupname}} in all available languages. |