| Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /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,64837,64846 |
| 2 | 2 | + /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,64837,64846,64860 |
| Index: branches/wmf/1.16wmf4/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 Title || !$nu->getId() ) { |
| 279 | 279 | wfDebug( "Target is invalid user.\n" ); |
| 280 | 280 | return "notarget"; |
| 281 | 281 | } else if ( !$nu->isEmailConfirmed() ) { |
| Property changes on: branches/wmf/1.16wmf4/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,60970 |
| /trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64846 |
| 283 | 283 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967,60970 |
| /trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64846,64860 |