From f23b5fbcaeb2db9ac92c290cc53a9b8ea0b74605 Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 4 Apr 2013 10:56:51 +0000 Subject: 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 --- include/functions_user.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index db9da568c..145d00954 100644 --- a/include/functions_user.inc.php +++ b/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); -- cgit v1.2.3