Changeset 22005 for trunk

Timestamp:

Apr 4, 2013, 12:56:51 PM (12 years ago)

Author:

plg

Message:

merge r21236 from branch 2.5 to trunk

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

File:

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

trunk/include/functions_user.inc.php

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