From 3f1fd4328b4ffc10579570052b4fb0557058de0e Mon Sep 17 00:00:00 2001 From: S Page Date: Thu, 7 Feb 2013 23:46:27 -0800 Subject: [PATCH] fix logic introduced in addNewAccountInternal Jenkins' PHP codesniffer complains about the whitespace at line 318. I'm pretty sure gerrit 17952 (commit 69ea4400) introduced bad logic. Part of the if statement boils down to userExists( userName || authenticate( userName, password) ) if userName is falsy then it calls userExists on the boolean return value of authenticate(). I think this change puts it back to the way it was. Change-Id: If334464ffa993490abe8919591a18a4c3935bcfb --- includes/specials/SpecialUserlogin.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 63d101b8ee..705f14f2c8 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -314,8 +314,10 @@ class LoginForm extends SpecialPage { if( 'local' != $this->mDomain && $this->mDomain != '' ) { if( !$wgAuth->canCreateAccounts() && - ( !$wgAuth->userExists( $this->mUsername || - !$wgAuth->authenticate( $this->mUsername, $this->mPassword ) ) ) + ( + !$wgAuth->userExists( $this->mUsername ) || + !$wgAuth->authenticate( $this->mUsername, $this->mPassword ) + ) ) { return Status::newFatal( 'wrongpassword' ); } -- 2.20.1