* Do not force a password for account creation by email

 set pseudo password, it will be replaced later by a random generated password

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e91ac11..c839013 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -166,6 +166,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Check for if IP is blocked as part of a range when unblocking (see above bug-
   fix) was faulty. Now fixed.
 * Fixed wpReason URL parameter to action=delete.
+* Do not force a password for account creation by email
 
 === API changes in 1.12 ===
 

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 7094547..92f06ab 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -264,22 +264,29 @@ class LoginForm {
                        return false;
                }
 
+               # check for minimal password length
                if ( !$u->isValidPassword( $this->mPassword ) ) {
-                       $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
-                       return false;
+                       if ( !$this->mCreateaccountMail ) {
+                               $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+                               return false;
+                       } else {
+                               # do not force a password for account creation by email
+                               # set pseudo password, it will be replaced later by a random generated password
+                               $this->mPassword = '-';
+                       }
                }
-               
+
                # if you need a confirmed email address to edit, then obviously you need an email address.
                if ( $wgEmailConfirmToEdit && empty( $this->mEmail ) ) {
                        $this->mainLoginForm( wfMsg( 'noemailtitle' ) );
                        return false;
                }
-               
+
                if( !empty( $this->mEmail ) && !User::isValidEmailAddr( $this->mEmail ) ) {
                        $this->mainLoginForm( wfMsg( 'invalidemailaddress' ) );
                        return false;
                }
-               
+
                # Set some additional data so the AbortNewAccount hook can be
                # used for more than just username validation
                $u->setEmail( $this->mEmail );