fix logic introduced in addNewAccountInternal
authorS Page <spage@wikimedia.org>
Fri, 8 Feb 2013 07:46:27 +0000 (23:46 -0800)
committerS Page <spage@wikimedia.org>
Fri, 8 Feb 2013 07:46:27 +0000 (23:46 -0800)
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

index 63d101b..705f14f 100644 (file)
@@ -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' );
                        }