| Index: trunk/extensions/ConfirmAccount/presentation/ConfirmAccountUI.hooks.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | return true; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | | - public static function checkIfAccountNameIsPending( $user, &$abortError ) { |
| | 26 | + public static function checkIfAccountNameIsPending( User $user, &$abortError ) { |
| 27 | 27 | # If an account is made with name X, and one is pending with name X |
| 28 | 28 | # we will have problems if the pending one is later confirmed |
| 29 | 29 | $dbw = wfGetDB( DB_MASTER ); |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php |
| — | — | @@ -225,7 +225,7 @@ |
| 226 | 226 | # Now create a dummy user ($u) and check if it is valid |
| 227 | 227 | $name = trim( $this->mUsername ); |
| 228 | 228 | $u = User::newFromName( $name, 'creatable' ); |
| 229 | | - if ( is_null( $u ) ) { |
| | 229 | + if ( !$u ) { |
| 230 | 230 | $this->showForm( wfMsgHtml( 'noname' ) ); |
| 231 | 231 | return; |
| 232 | 232 | } |