| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -340,7 +340,6 @@ |
| 341 | 341 | 'yourdomainname', |
| 342 | 342 | 'externaldberror', |
| 343 | 343 | 'loginproblem', |
| 344 | | - 'alreadyloggedin', |
| 345 | 344 | 'login', |
| 346 | 345 | 'loginprompt', |
| 347 | 346 | 'userlogin', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -811,7 +811,6 @@ |
| 812 | 812 | 'yourdomainname' => 'Your domain:', |
| 813 | 813 | 'externaldberror' => 'There was either an external authentication database error or you are not allowed to update your external account.', |
| 814 | 814 | 'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!', |
| 815 | | -'alreadyloggedin' => '<strong>User $1, you are already logged in!</strong><br />', |
| 816 | 815 | 'login' => 'Log in', |
| 817 | 816 | 'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.', |
| 818 | 817 | 'userlogin' => 'Log in / create account', |
| Index: trunk/extensions/OpenID/Consumer.php |
| — | — | @@ -631,7 +631,7 @@ |
| 632 | 632 | $wgOut->setPageTitle( wfMsg( 'openiderror' ) ); |
| 633 | 633 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 634 | 634 | $wgOut->setArticleRelated( false ); |
| 635 | | - $wgOut->addWikiText( wfMsg( 'alreadyloggedin', $wgUser->getName() ) ); |
| | 635 | + $wgOut->addWikiText( wfMsg( 'openidalreadyloggedin', $wgUser->getName() ) ); |
| 636 | 636 | $wgOut->returnToMain( $auto ); |
| 637 | 637 | } |
| 638 | 638 | |
| Index: trunk/extensions/OpenID/OpenID.php |
| — | — | @@ -87,6 +87,8 @@ |
| 88 | 88 | 'openidconvertsuccesstext' => 'You have successfully converted your OpenID to $1.', |
| 89 | 89 | 'openidconvertyourstext' => 'That is already your OpenID.', |
| 90 | 90 | 'openidconvertothertext' => 'That is someone else\'s OpenID.', |
| | 91 | + 'openidalreadyloggedin' => '<strong>User $1, you are already logged in!</strong>', |
| | 92 | + |
| 91 | 93 | )); |
| 92 | 94 | |
| 93 | 95 | SpecialPage::AddPage(new UnlistedSpecialPage('OpenIDLogin')); |