close #3716

craigh · craigh · commit 167add8fc486 · 2017-07-27T09:27:52.000-04:00
diff --git a/src/system/ZAuthModule/AuthenticationMethod/NativeEitherAuthenticationMethod.php b/src/system/ZAuthModule/AuthenticationMethod/NativeEitherAuthenticationMethod.php
@@ -69,8 +69,11 @@ public function getLoginTemplateName($type = 'page', $position = 'left')
      */
     public function authenticate(array $data = [])
     {
-        $field = filter_var($data['either'], FILTER_VALIDATE_EMAIL) ? 'email' : 'uname';
-        $data[$field] = $data['either'];
+        $field = 'email'; // default
+        if (isset($data['either'])) {
+            $field = filter_var($data['either'], FILTER_VALIDATE_EMAIL) ? 'email' : 'uname';
+            $data[$field] = $data['either'];
+        }
 
         return $this->authenticateByField($data, $field);
     }

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,11 @@ public function getLoginTemplateName($type = 'page', $position = 'left')`
`69`	`69`	`*/`
`70`	`70`	`public function authenticate(array $data = [])`
`71`	`71`	`{`
`72`		`- $field = filter_var($data['either'], FILTER_VALIDATE_EMAIL) ? 'email' : 'uname';`
`73`		`- $data[$field] = $data['either'];`
	`72`	`+ $field = 'email'; // default`
	`73`	`+ if (isset($data['either'])) {`
	`74`	`+ $field = filter_var($data['either'], FILTER_VALIDATE_EMAIL) ? 'email' : 'uname';`
	`75`	`+ $data[$field] = $data['either'];`
	`76`	`+ }`
`74`	`77`
`75`	`78`	`return $this->authenticateByField($data, $field);`
`76`	`79`	`}`