| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1313,13 +1313,16 @@ |
| 1314 | 1314 | * @todo document |
| 1315 | 1315 | */ |
| 1316 | 1316 | function userNotLoggedInPage() { |
| 1317 | | - global $wgOut; |
| 1318 | | - |
| | 1317 | + global $wgUser, $wgOut; |
| | 1318 | + $skin = $wgUser->getSkin(); |
| | 1319 | + $loginTitle = Title::makeTitle( NS_SPECIAL, 'Userlogin' ); |
| | 1320 | + $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $this->mTitle->getPrefixedText() ); |
| | 1321 | + |
| 1319 | 1322 | $wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) ); |
| 1320 | 1323 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 1321 | 1324 | $wgOut->setArticleRelated( false ); |
| 1322 | | - |
| 1323 | | - $wgOut->addWikiText( wfMsg( 'whitelistedittext' ) ); |
| | 1325 | + |
| | 1326 | + $wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) ); |
| 1324 | 1327 | $wgOut->returnToMain( false ); |
| 1325 | 1328 | } |
| 1326 | 1329 | |
| Index: trunk/phase3/languages/Messages.php |
| — | — | @@ -371,6 +371,7 @@ |
| 372 | 372 | 'alreadyloggedin' => "<strong>User $1, you are already logged in!</strong><br />", |
| 373 | 373 | |
| 374 | 374 | 'login' => 'Log in', |
| | 375 | +'loginshort' => 'log in', |
| 375 | 376 | 'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.', |
| 376 | 377 | 'userlogin' => 'Log in / create account', |
| 377 | 378 | 'logout' => 'Log out', |
| — | — | @@ -481,7 +482,7 @@ |
| 482 | 483 | |
| 483 | 484 | Your IP address is $3. Please include this address in any queries you make.', |
| 484 | 485 | 'whitelistedittitle' => 'Login required to edit', |
| 485 | | -'whitelistedittext' => 'You have to [[Special:Userlogin|login]] to edit pages.', |
| | 486 | +'whitelistedittext' => 'You have to $1 to edit pages.', |
| 486 | 487 | 'whitelistreadtitle' => 'Login required to read', |
| 487 | 488 | 'whitelistreadtext' => 'You have to [[Special:Userlogin|login]] to read pages.', |
| 488 | 489 | 'whitelistacctitle' => 'You are not allowed to create an account', |
| — | — | @@ -489,7 +490,7 @@ |
| 490 | 491 | 'confirmedittitle' => 'E-mail confirmation required to edit', |
| 491 | 492 | 'confirmedittext' => 'You must confirm your e-mail address before editing pages. Please set and validate your e-mail address through your [[Special:Preferences|user preferences]].', |
| 492 | 493 | 'loginreqtitle' => 'Login Required', |
| 493 | | -'loginreqlink' => 'login', |
| | 494 | +'loginreqlink' => 'log in', |
| 494 | 495 | 'loginreqpagetext' => 'You must $1 to view other pages.', |
| 495 | 496 | 'accmailtitle' => 'Password sent.', |
| 496 | 497 | 'accmailtext' => 'The password for "$1" has been sent to $2.', |