From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Tue, 3 Apr 2012 16:44:06 +0000 (+0200)
Subject: Per Siebrand, follow-up I55939bb5295e73594c3fdf7287dddbc16a233ce4 (r4099):
X-Git-Tag: 1.31.0-rc.0~24058
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=5fc4d3739cbbefc5c654447852c9ed67acf51771;p=lhc%2Fweb%2Fwiklou.git

Per Siebrand, follow-up I55939bb5295e73594c3fdf7287dddbc16a233ce4 (r4099):
* Add message documentation
* Changed 'emaildisabled' wording for better understandability
* Added @since comment in User::setEmailWithConfirmation() and @deprecated in Preferences::trySetUserEmail()

Change-Id: I73c4b82ff2493a26ffbab426f30cd9af5680e503
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 1904f2d667..f54d732277 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1432,6 +1432,8 @@ class Preferences {
 	 * Try to set a user's email address.
 	 * This does *not* try to validate the address.
 	 * Caller is responsible for checking $wgAuth.
+	 *
+	 * @deprecated in 1.20; use User::setEmailWithConfirmation() instead.
 	 * @param $user User
 	 * @param $newaddr string New email address
 	 * @return Array (true on success or Status on failure, info string)
diff --git a/includes/User.php b/includes/User.php
index f94b30cf57..9c5a11c68b 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2115,6 +2115,7 @@ class User {
 	/**
 	 * Set the user's e-mail address and a confirmation mail if needed.
 	 *
+	 * @since 1.20
 	 * @param $str String New e-mail address
 	 * @return Status
 	 */
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7c42e5a339..7dcfc60c83 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1147,7 +1147,7 @@ No e-mail will be sent for any of the following features.',
 'invalidemailaddress'        => 'The e-mail address cannot be accepted as it appears to have an invalid format.
 Please enter a well-formatted address or empty that field.',
 'cannotchangeemail'          => 'Account e-mail addresses cannot be changed on this wiki.',
-'emaildisabled'              => 'E-mails are disabled on this site.',
+'emaildisabled'              => 'This site cannot send e-mails.',
 'accountcreated'             => 'Account created',
 'accountcreatedtext'         => 'The user account for $1 has been created.',
 'createaccount-title'        => 'Account creation for {{SITENAME}}',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 6bd933c738..26a8b98a5a 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -772,6 +772,7 @@ Parameters:
 'emailconfirmlink'           => 'Link to [[Special:ConfirmEmail]]. Appears in [[Special:Preferences]] > {{int:prefs-personal}} > {{int:email}} after saving your e-mail address but before it has been authenticated.',
 'invalidemailaddress'        => 'Shown as a warning when written an invalid e-mail adress in [[Special:Preferences]] and {{fullurl:Special:UserLogin|type=signup}} page',
 'cannotchangeemail'          => 'Error message shown when user goes to [[Special:ChangeEmail]] but email addresses cannot be changed on the site.',
+'emaildisabled'              => 'Error message shown when user tries to set an e-mail address but e-mail features are disabled.',
 'createaccount-title'        => 'This is the subject of an e-mail sent to the e-mail address entered at [[Special:CreateAccount]] if the button "by e-mail" is clicked.',
 'createaccount-text'         => 'This text is sent as an e-mail to the e-mail address entered at [[Special:CreateAccount]] if the button "by e-mail" is clicked.