Permalink
Browse files

merge r21236 from branch 2.5 to trunk

bug 2861: avoid "invalid password" with manual upgrade and admin session expired


git-svn-id: http://piwigo.org/svn/trunk@22005 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
plegall committed Apr 4, 2013
1 parent 1965cbd commit f23b5fbcaeb2db9ac92c290cc53a9b8ea0b74605
Showing with 6 additions and 1 deletion.
  1. +6 −1 include/functions_user.inc.php
@@ -1161,8 +1161,13 @@ function pwg_password_verify($password, $hash, $user_id=null)
$check = ($hash == md5($password));
}
if ($check and isset($user_id) and !$conf['external_authentification'])
if ($check)
{
if (!isset($user_id) or $conf['external_authentification'])
{
return true;
}
// Rehash using new hash.
$hash = pwg_password_hash($password);

0 comments on commit f23b5fb

Please sign in to comment.