From 02e3c33b46a445598d8b1e483567576dfdc478dd Mon Sep 17 00:00:00 2001 From: Platonides Date: Sun, 19 Dec 2010 22:40:46 +0000 Subject: [PATCH] Aryeh was right in r71721. Create two new messages. nocookiesforlogin defaults to nocookieslogin --- includes/specials/SpecialUserlogin.php | 4 ++-- languages/messages/MessagesEn.php | 3 +++ languages/messages/MessagesQqq.php | 2 ++ maintenance/language/messageTypes.inc | 1 + maintenance/language/messages.inc | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 6feb4e6113..bd8e7cae07 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -274,7 +274,7 @@ class LoginForm extends SpecialPage { # Request forgery checks. if ( !self::getCreateaccountToken() ) { self::setCreateaccountToken(); - $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) ); + $this->mainLoginForm( wfMsgExt( 'nocookiesfornew', array( 'parseinline' ) ) ); return false; } @@ -659,7 +659,7 @@ class LoginForm extends SpecialPage { break; case self::NEED_TOKEN: - $this->mainLoginForm( wfMsgExt( 'nocookieslogin', array( 'parseinline' ) ) ); + $this->mainLoginForm( wfMsgExt( 'nocookiesforlogin', array( 'parseinline' ) ) ); break; case self::WRONG_TOKEN: $this->mainLoginForm( wfMsg( 'sessionfailure' ) ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index b079503df8..4172c355a5 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1070,9 +1070,12 @@ Please choose a different name.', {{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.', +'nocookiesfornew' => 'The user account wasn\'t created, as we couldn\'t confirm its source. +Ensure you have cookies enabled, reload this page and try again.', 'nocookieslogin' => '{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them and try again.', +'nocookiesforlogin' => '{{int:nocookieslogin}}', 'noname' => 'You have not specified a valid username.', 'loginsuccesstitle' => 'Login successful', 'loginsuccess' => "'''You are now logged in to {{SITENAME}} as \"\$1\".'''", diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index fdc9011348..458fcba6d3 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -654,7 +654,9 @@ $1 is a filename, I think.', 'createaccounterror' => 'Parameters: * $1 is an error message', 'nocookiesnew' => "This message is displayed when a new account was successfully created, but the browser doesn't accept cookies.", +'nocookiesfornew' => "This message is displayed when the user tried to create a new account, but it failed the CSRF check. It could be blocking an attack, but most likely, the browser isn't accepting cookies.", 'nocookieslogin' => "This message is displayed when someone tried to login, but the browser doesn't accept cookies.", +'nocookiesforlogin' => "This message is displayed when someone tried to login and the CSRF failed (most likely, the browser doesn't accept cookies). Defaults to nocookieslogin", 'loginsuccesstitle' => 'The title of the page saying that you are logged in. The content of the page is the message "[[MediaWiki:Loginsuccess/{{SUBPAGENAME}}]]".', 'loginsuccess' => 'The content of the page saying that you are logged in. The title of the page is "[[MediaWiki:Loginsuccesstitle/{{SUBPAGENAME}}|{{int:loginsuccesstitle}}]]". $1 is the name of the logged in user. diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index d92818c70f..117eafcabb 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -381,6 +381,7 @@ $wgOptionalMessages = array( 'usermessage-template', 'revisionmove-backlink', 'filepage.css', + 'nocookiesforlogin', ); /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index e7a07454ca..db6b7f15d0 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -436,6 +436,8 @@ $wgMessageStructure = array( 'createaccounterror', 'nocookiesnew', 'nocookieslogin', + 'nocookiesfornew', + 'nocookiesforlogin', 'noname', 'loginsuccesstitle', 'loginsuccess', -- 2.20.1