Revert r58171/r58172 for now. It seems it breaks login to translatewiki.net

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1650305..e9dcc56 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -598,9 +598,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18019) Users are now warned when moving a file to a name in use on a
   shared repository and only users with the 'reupload-shared' permission can
   complete the move.
-* User::isValidPassword now only returns boolean results, User::getPasswordValidity
-  can be used to get an error message string
-* The error message shown in Special:ChangePassword now parses wiki markup
 * (bug 18909) Add missing Postgres INSERT SELECT wrapper
 
 == API changes in 1.16 ==

diff --git a/includes/User.php b/includes/User.php
index 7998f1b..d4cfbd7 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -624,8 +624,16 @@ class User {
         * @return bool True or false
         */
        function isValidPassword( $password ) {
-               //simple boolean wrapper for getPasswordValidity
-               return $this->getPasswordValidity( $password ) === true;
+               global $wgMinimalPasswordLength, $wgContLang;
+
+               if( !wfRunHooks( 'isValidPassword', array( $password, &$result, $this ) ) )
+                       return $result;
+               if( $result === false )
+                       return false;
+ 
+               // Password needs to be long enough, and can't be the same as the username
+               return strlen( $password ) >= $wgMinimalPasswordLength
+                       && $wgContLang->lc( $password ) !== $wgContLang->lc( $this->mName );
        }
 
        /**
@@ -637,21 +645,14 @@ class User {
        function getPasswordValidity( $password ) {
                global $wgMinimalPasswordLength, $wgContLang;
                
-               $result = false; //init $result to false for the internal checks
-               
-               if( !wfRunHooks( 'isValidPassword', array( $password, &$result, $this ) ) )
-                       return $result;
-               
-               if ( $result === false ) {
+               if ( !$this->isValidPassword( $password ) ) {
                        if( strlen( $password ) < $wgMinimalPasswordLength ) {
                                return 'passwordtooshort';
                        } elseif ( $wgContLang->lc( $password ) == $wgContLang->lc( $this->mName ) ) {
                                return 'password-name-match';
                        }
-               } elseif( $result === true ) {
-                       return true;
                } else {
-                       return $result; //the isValidPassword hook set a string $result and returned true
+                       return true;
                }
        }
 

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 86bf0b8..3e49354 100644 (file)
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -68,7 +68,7 @@ class SpecialResetpass extends SpecialPage {
 
        function error( $msg ) {
                global $wgOut;
-               $wgOut->addWikiText( '<div class="error">' . $msg . '</div>' );
+               $wgOut->addHTML( Xml::element('p', array( 'class' => 'error' ), $msg ) );
        }
 
        function showForm() {