From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 10 Jan 2011 19:55:30 +0000 (+0000)
Subject: Fix RFC 5322 'atext'
X-Git-Tag: 1.31.0-rc.0~32645
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=73b63cc7789493b1030925f574cd7164d9dc6cfe;p=lhc%2Fweb%2Fwiklou.git

Fix RFC 5322 'atext'

An additional character was introducted in the RFC 5322 atext fragment.
Spotted with r79924 which send the file as latin1 encoding.
---

diff --git a/includes/User.php b/includes/User.php
index 594a10938a..40a41ed4f8 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -652,7 +652,7 @@ class User {
 		if( !wfRunHooks( 'isValidEmailAddr', array( $addr, &$result ) ) ) {
 			return $result;
 		}
-		$rfc5322_atext   = "a-z0-9!#$%&'*+-\/=?^_`{|}—~" ;
+		$rfc5322_atext   = "a-z0-9!#$%&'*+-\/=?^_`{|}~" ;
 		$rfc1034_ldh_str = "a-z0-9-" ;
 
 		$HTML5_email_regexp = "/
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 34ad85b2a1..c8c2114a3c 100644
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -455,7 +455,7 @@
 						 "|" / "}" /
 						 "~"
 			*/
-			var	rfc5322_atext = "a-z0-9!#$%&'*+-/=?^_`{|}Ð~",
+			var	rfc5322_atext = "a-z0-9!#$%&'*+-/=?^_`{|}~",
 		
 			/**
 			 * Next define the RFC 1034 'ldh-str'
@@ -496,4 +496,4 @@
 
 	mw.util.init();
 
-})(jQuery, mediaWiki);
\ No newline at end of file
+})(jQuery, mediaWiki);