| Index: branches/REL1_16/phase3/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 | |
| — | — | @@ -708,7 +708,7 @@ |
| 709 | 709 | return; |
| 710 | 710 | } |
| 711 | 711 | $u = User::newFromName( $this->mName ); |
| 712 | | - if( is_null( $u ) ) { |
| | 712 | + if( !$u instanceof User ) { |
| 713 | 713 | $this->mainLoginForm( wfMsg( 'noname' ) ); |
| 714 | 714 | return; |
| 715 | 715 | } |
| Index: branches/REL1_16/phase3/includes/specials/SpecialEmailuser.php |
| — | — | @@ -274,7 +274,7 @@ |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | $nu = User::newFromName( $nt->getText() ); |
| 278 | | - if( is_null( $nu ) || !$nu->getId() ) { |
| | 278 | + if( !$nu instanceof User || !$nu->getId() ) { |
| 279 | 279 | wfDebug( "Target is invalid user.\n" ); |
| 280 | 280 | return "notarget"; |
| 281 | 281 | } else if ( !$nu->isEmailConfirmed() ) { |
| Property changes on: branches/REL1_16/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 282 | 282 | - /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| /trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901 |
| 283 | 283 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| /trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64837,64860,64862 |
| Index: branches/REL1_16/phase3/RELEASE-NOTES |
| — | — | @@ -1,9 +1,7 @@ |
| 2 | 2 | = MediaWiki release notes = |
| 3 | 3 | |
| 4 | | -== MediaWiki 1.16 beta 2 == |
| | 4 | +== MediaWiki 1.16 beta 3 == |
| 5 | 5 | |
| 6 | | -April 7, 2010 |
| 7 | | - |
| 8 | 6 | This is a pre-release beta of the MediaWiki 1.16 branch. |
| 9 | 7 | |
| 10 | 8 | === Summary of selected changes in 1.16 === |
| — | — | @@ -42,6 +40,11 @@ |
| 43 | 41 | you have the DBA extension for PHP installed, this will improve performance |
| 44 | 42 | further. |
| 45 | 43 | |
| | 44 | +== Changes since 1.16 beta 2 == |
| | 45 | + |
| | 46 | +* Fixed bugs in the [[Special:Userlogin]] and [[Special:Emailuser]] handling of |
| | 47 | + invalid usernames. |
| | 48 | + |
| 46 | 49 | === Changes since 1.16 beta 1 === |
| 47 | 50 | |
| 48 | 51 | * Fixed errors in maintenance/patchSql.php |