http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97248
Revision: 97248
Author: nikerabbit
Date: 2011-09-16 08:27:54 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Followup r96653. Reduced the amount of constant markup in the message.
Modified Paths:
--------------
trunk/extensions/CentralAuth/CentralAuth.i18n.php
trunk/extensions/CentralAuth/specials/SpecialMergeAccount.php
Modified: trunk/extensions/CentralAuth/CentralAuth.i18n.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuth.i18n.php 2011-09-16 08:02:39 UTC
(rev 97247)
+++ trunk/extensions/CentralAuth/CentralAuth.i18n.php 2011-09-16 08:27:54 UTC
(rev 97248)
@@ -18,7 +18,7 @@
'centralauth-desc' => '[[Special:MergeAccount|Merge
account]] across wikis of {{int:Centralauth-groupname}}',
'centralauth-mergeaccount-desc' => '[[Special:MergeAccount|Merges
multiple accounts]] for Single User Login',
'centralauth-merge-denied' => 'Sorry, you do not have permission
to access this page.',
- '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.',
+ 'centralauth-merge-notlogged' => 'Please <span
class="plainlinks">[$1 log in]</span> to check if your accounts have been fully
merged.',
'centralauth-merge-welcome' => "'''Your user account has not yet
been migrated to the unified login system of {{int:Centralauth-groupname}}.'''
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.
Modified: trunk/extensions/CentralAuth/specials/SpecialMergeAccount.php
===================================================================
--- trunk/extensions/CentralAuth/specials/SpecialMergeAccount.php
2011-09-16 08:02:39 UTC (rev 97247)
+++ trunk/extensions/CentralAuth/specials/SpecialMergeAccount.php
2011-09-16 08:27:54 UTC (rev 97248)
@@ -16,7 +16,9 @@
}
if ( !$wgUser->isLoggedIn() ) {
- $wgOut->addWikiMsg( 'centralauth-merge-notlogged' );
+ $loginpage = SpecialPage::getTitleFor( 'Userlogin' );
+ $loginurl = $loginpage->getFullUrl( array( 'returnto'
=> $this->getTitle->getPrefixedText() ) );
+ $wgOut->addWikiMsg( 'centralauth-merge-notlogged',
$loginurl );
$wgOut->addWikiMsg( 'centralauth-readmore-text' );
return;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
