From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Mar 2008 20:17:55 +0000 (+0000)
Subject: * (bug 13540) Date format in confirmation e-mail now matches message language
X-Git-Tag: 1.31.0-rc.0~48742
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=d5e9d4e3f558714c3eb750954b8734b2f5d32f42;p=lhc%2Fweb%2Fwiklou.git

* (bug 13540) Date format in confirmation e-mail now matches message language
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4d418f3603..645df1441d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -140,6 +140,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13522) Fix fatal error in Parser::extractTagsAndParams
 * (bug 13532) Use proper timestamp call when reverting images
 * (bug 13543) Updated FAQ link in the installer sidebar
+* (bug 13540) Date format in confirmation e-mail now matches message language
 
 
 === API changes in 1.13 ===
diff --git a/includes/User.php b/includes/User.php
index e2e093b6e2..103130f072 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2384,7 +2384,7 @@ class User {
 	 * @return mixed True on success, a WikiError object on failure.
 	 */
 	function sendConfirmationMail() {
-		global $wgContLang;
+		global $wgLang;
 		$expiration = null; // gets passed-by-ref and defined in next line.
 		$token = $this->confirmationToken( $expiration );
 		$url = $this->confirmationTokenUrl( $token );
@@ -2394,7 +2394,7 @@ class User {
 				wfGetIP(),
 				$this->getName(),
 				$url,
-				$wgContLang->timeanddate( $expiration, false ),
+				$wgLang->timeanddate( $expiration, false ),
 				$invalidateURL ) );
 	}