| Index: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | # TODO: Allow some magic here for invalid external names, e.g., let the |
| 455 | 455 | # user choose a different wiki name. |
| 456 | 456 | $u = User::newFromName( $this->mName ); |
| 457 | | - if( is_null( $u ) || !User::isUsableName( $u->getName() ) ) { |
| | 457 | + if( !( $u instanceof User ) || !User::isUsableName( $u->getName() ) ) { |
| 458 | 458 | return self::ILLEGAL; |
| 459 | 459 | } |
| 460 | 460 | |
| Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 461 | 461 | + /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646 |
| /branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321 |
| /branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970 |
| /trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901 |