From: Nick Jenkins <nickj@users.mediawiki.org>
Date: Wed, 4 Oct 2006 12:13:22 +0000 (+0000)
Subject: (Bug 7004) PHP iconv() notice on bad password input to Special:Userlogin, with E_ALL... 
X-Git-Tag: 1.31.0-rc.0~55626
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=794e8744d467d0640649a6a88c06b4d328a3af9a;p=lhc%2Fweb%2Fwiklou.git

(Bug 7004) PHP iconv() notice on bad password input to Special:Userlogin, with E_ALL enabled.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58cbf4ad2e..ffa6197dd0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -263,6 +263,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   due to negative LIMIT clause, caused by integer wraparound.
 * Fixed various bugs related to table prefixes, especially the interaction
   between table prefixes and memcached, which was formerly completely broken.
+* (bug 7004) PHP iconv() notice on bad password input to Special:Userlogin.
 
 
 == Languages updated ==
diff --git a/includes/User.php b/includes/User.php
index 6df9e0c2ce..f6567b9494 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1868,7 +1868,7 @@ class User {
 		} elseif ( function_exists( 'iconv' ) ) {
 			# Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted
 			# Check for this with iconv
-			$cp1252hash = $this->encryptPassword( iconv( 'UTF-8', 'WINDOWS-1252', $password ) );
+			$cp1252hash = $this->encryptPassword( iconv( 'UTF-8', 'WINDOWS-1252//TRANSLIT', $password ) );
 			if ( 0 == strcmp( $cp1252hash, $this->mPassword ) ) {
 				return true;
 			}