From 72431ff920a3d59e9bf92af50f973221807468ef Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Mon, 7 Sep 2009 19:20:20 +0000
Subject: [PATCH] Followup to r55990 - rename method to avoid PHP Strict
 warnings

---
 includes/Login.php                         | 2 +-
 includes/api/ApiLogin.php                  | 2 +-
 includes/specials/SpecialCreateAccount.php | 2 +-
 includes/specials/SpecialUserlogin.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/Login.php b/includes/Login.php
index d8bc953866..f6cf62aa5d 100644
--- 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 8022d445d6..6645a9ee0f 100644
--- 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 5c5c2e559f..123f2f3d55 100644
--- 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 9d9fdfe60f..b6c30d6ea2 100644
--- 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 ) {
-- 
2.20.1