| Index: trunk/phase3/includes/User.php |
| — | — | @@ -354,9 +354,7 @@ |
| 355 | 355 | $validate = 'valid'; |
| 356 | 356 | } |
| 357 | 357 | $name = self::getCanonicalName( $name, $validate ); |
| 358 | | - if ( WikiError::isError( $name ) ) { |
| 359 | | - return $name; |
| 360 | | - } elseif ( $name === false ) { |
| | 358 | + if ( $name === false ) { |
| 361 | 359 | return false; |
| 362 | 360 | } else { |
| 363 | 361 | # Create unloaded user object |
| — | — | @@ -701,7 +699,7 @@ |
| 702 | 700 | # with title normalisation, but then it's too late to |
| 703 | 701 | # check elsewhere |
| 704 | 702 | if( strpos( $name, '#' ) !== false ) |
| 705 | | - return new WikiError( 'usernamehasherror' ); |
| | 703 | + return false; |
| 706 | 704 | |
| 707 | 705 | # Clean up name according to title rules |
| 708 | 706 | $t = ( $validate === 'valid' ) ? |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -265,11 +265,6 @@ |
| 266 | 266 | # Now create a dummy user ($u) and check if it is valid |
| 267 | 267 | $name = trim( $this->mName ); |
| 268 | 268 | $u = User::newFromName( $name, 'creatable' ); |
| 269 | | - if ( WikiError::isError( $u ) ) { |
| 270 | | - $this->mainLoginForm( wfMsg( $u->getMessage() ) ); |
| 271 | | - return false; |
| 272 | | - } |
| 273 | | - |
| 274 | 269 | if ( !is_object( $u ) ) { |
| 275 | 270 | $this->mainLoginForm( wfMsg( 'noname' ) ); |
| 276 | 271 | return false; |