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

@@ -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);