Changeset 21236 for branches/2.5/include/functions_user.inc.php

Timestamp:

Mar 6, 2013, 9:56:04 AM (11 years ago)

Author:

plg

Message:

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

File:

• branches/2.5/include/functions_user.inc.php (modified) (1 diff)

branches/2.5/include/functions_user.inc.php

@@ -1155 +1155 @@
     }
     
-    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);