Permalink
Browse files

Merge branch '2017.12' into 2018.09

  • Loading branch information...
glye committed Oct 31, 2018
2 parents bafa1a7 + 13f03a2 commit 7f569287822e0830b664708aa8ad4de7149c129e
Showing with 7 additions and 0 deletions.
  1. +7 −0 kernel/classes/datatypes/ezuser/ezuser.php
@@ -783,6 +783,11 @@ protected static function loginFailed( $userID = false, $login )
*/
protected static function _loginUser( $login, $password, $authenticationMatch = false )
{
if ( $login == '' || $password == '' )
{
return false;
}
$http = eZHTTPTool::instance();
$db = eZDB::instance();
@@ -821,6 +826,7 @@ protected static function _loginUser( $login, $password, $authenticationMatch =
WHERE ( $loginText ) AND
ezcontentobject.status='$contentObjectStatus' AND
ezcontentobject.id=contentobject_id AND
password_hash_type!=0 AND
( ( password_hash_type!=4 ) OR
( password_hash_type=4 AND
password_hash=PASSWORD('$passwordEscaped') ) )";
@@ -831,6 +837,7 @@ protected static function _loginUser( $login, $password, $authenticationMatch =
password_hash_type, email, login
FROM ezuser, ezcontentobject
WHERE ( $loginText )
AND password_hash_type!=0
AND ezcontentobject.status='$contentObjectStatus'
AND ezcontentobject.id=contentobject_id";
}

0 comments on commit 7f56928

Please sign in to comment.