|
|
@@ -367,11 +367,22 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
|
|
|
$this->_authenticateSetup();
|
|
|
$dbSelect = $this->_authenticateCreateSelect();
|
|
|
$resultIdentities = $this->_authenticateQuerySelect($dbSelect);
|
|
|
-
|
|
|
+
|
|
|
if ( ($authResult = $this->_authenticateValidateResultSet($resultIdentities)) instanceof Zend_Auth_Result) {
|
|
|
return $authResult;
|
|
|
}
|
|
|
|
|
|
+ if (true === $this->getAmbiguityIdentity()) {
|
|
|
+ $validIdentities = array ();
|
|
|
+ $zendAuthCredentialMatchColumn = $this->_zendDb->foldCase('zend_auth_credential_match');
|
|
|
+ foreach ($resultIdentities as $identity) {
|
|
|
+ if (1 === (int) $identity[$zendAuthCredentialMatchColumn]) {
|
|
|
+ $validIdentities[] = $identity;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $resultIdentities = $validIdentities;
|
|
|
+ }
|
|
|
+
|
|
|
$authResult = $this->_authenticateValidateResult(array_shift($resultIdentities));
|
|
|
return $authResult;
|
|
|
}
|