Followup to r55990 - rename method to avoid PHP Strict warnings

diff --git a/includes/Login.php b/includes/Login.php
index d8bc953..f6cf62a 100644 (file)
--- a/includes/Login.php
+++ b/includes/Login.php
@@ -110,7 +110,7 @@ class Login {
                return $this->mUser;
        }
        
-       public function login(){
+       public function attemptLogin(){
                global $wgUser;
                $code = $this->authenticateUserData();
                if( !$code == self::SUCCESS ){

diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 8022d44..6645a9e 100644 (file)
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -69,7 +69,7 @@ class ApiLogin extends ApiBase {
                }
 
                $loginForm = new Login( $req );
-               switch ( $authRes = $loginForm->login() ) {
+               switch ( $authRes = $loginForm->attemptLogin() ) {
                        case Login::SUCCESS :
                                global $wgUser, $wgCookiePrefix;
 

diff --git a/includes/specials/SpecialCreateAccount.php b/includes/specials/SpecialCreateAccount.php
index 5c5c2e5..123f2f3 100644 (file)
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -195,7 +195,7 @@ class SpecialCreateAccount extends SpecialPage {
                                $this->showMainForm( wfMsg( 'mailerror' ) );
                        }
                } else {
-                       $wgOut->addWikiMsg( 'accmailtext', $this->mLogin->mUserer->getName(), $this->mLogin->mUser->getEmail() );
+                       $wgOut->addWikiMsg( 'accmailtext', $this->mLogin->mUser->getName(), $this->mLogin->mUser->getEmail() );
                        $wgOut->returnToMain( false );
                }
        }

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 9d9fdfe..b6c30d6 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -415,7 +415,7 @@ class SpecialUserLogin extends SpecialPage {
 
        protected function processLogin(){
                global $wgUser, $wgAuth;
-               $result = $this->mLogin->login();
+               $result = $this->mLogin->attemptLogin();
                switch ( $result ) {
                        case Login::SUCCESS:
                                if( $this->hasSessionCookie() || $this->mSkipCookieCheck ) {