| Index: trunk/phase3/includes/api/ApiLogin.php |
| — | — | @@ -69,7 +69,7 @@ |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | $loginForm = new Login( $req ); |
| 73 | | - switch ( $authRes = $loginForm->login() ) { |
| | 73 | + switch ( $authRes = $loginForm->attemptLogin() ) { |
| 74 | 74 | case Login::SUCCESS : |
| 75 | 75 | global $wgUser, $wgCookiePrefix; |
| 76 | 76 | |
| Index: trunk/phase3/includes/Login.php |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | return $this->mUser; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | | - public function login(){ |
| | 114 | + public function attemptLogin(){ |
| 115 | 115 | global $wgUser; |
| 116 | 116 | $code = $this->authenticateUserData(); |
| 117 | 117 | if( !$code == self::SUCCESS ){ |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -415,7 +415,7 @@ |
| 416 | 416 | |
| 417 | 417 | protected function processLogin(){ |
| 418 | 418 | global $wgUser, $wgAuth; |
| 419 | | - $result = $this->mLogin->login(); |
| | 419 | + $result = $this->mLogin->attemptLogin(); |
| 420 | 420 | switch ( $result ) { |
| 421 | 421 | case Login::SUCCESS: |
| 422 | 422 | if( $this->hasSessionCookie() || $this->mSkipCookieCheck ) { |
| Index: trunk/phase3/includes/specials/SpecialCreateAccount.php |
| — | — | @@ -195,7 +195,7 @@ |
| 196 | 196 | $this->showMainForm( wfMsg( 'mailerror' ) ); |
| 197 | 197 | } |
| 198 | 198 | } else { |
| 199 | | - $wgOut->addWikiMsg( 'accmailtext', $this->mLogin->mUserer->getName(), $this->mLogin->mUser->getEmail() ); |
| | 199 | + $wgOut->addWikiMsg( 'accmailtext', $this->mLogin->mUser->getName(), $this->mLogin->mUser->getEmail() ); |
| 200 | 200 | $wgOut->returnToMain( false ); |
| 201 | 201 | } |
| 202 | 202 | } |