more specific error message, using WikiError, if user trys to create account with...

diff --git a/includes/User.php b/includes/User.php
index 2cb0203..fd97f3b 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -354,8 +354,10 @@ class User {
                        $validate = 'valid';
                }
                $name = self::getCanonicalName( $name, $validate );
-               if ( $name === false ) {
-                       return null;
+               if ( WikiError::isError( $name ) ) {
+                       return $name;
+               } elseif ( $name === false ) {
+                       return false;
                } else {
                        # Create unloaded user object
                        $u = new User;
@@ -693,7 +695,7 @@ class User {
                # with title normalisation, but then it's too late to
                # check elsewhere
                if( strpos( $name, '#' ) !== false )
-                       return false;
+                       return new WikiError( 'usernamehasherror' );
 
                # Clean up name according to title rules
                $t = ( $validate === 'valid' ) ?

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index f8be43b..5297964 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -267,6 +267,11 @@ class LoginForm {
                # Now create a dummy user ($u) and check if it is valid
                $name = trim( $this->mName );
                $u = User::newFromName( $name, 'creatable' );
+               if ( WikiError::isError( $u ) ) {
+                       $this->mainLoginForm( wfMsg( $u->getMessage() ) );
+                       return false;
+               }
+
                if ( is_null( $u ) ) {
                        $this->mainLoginForm( wfMsg( 'noname' ) );
                        return false;