Merged changes form stable branch up to 2.3.13

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 90a91a9c079b68e45344f3ed0609b87c9eddf2a8..ae0a4d753dcf152924a014a28d8520c7b2c90bf7 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -58,7 +58,7 @@ class current_user
 
        function login($company, $loginname, $password)
        {
-               global $security_areas, $security_groups, $security_headings, $path_to_root, $dflt_lang;
+               global $security_areas, $security_groups, $security_headings, $path_to_root, $dflt_lang, $login_delay;
 
                $this->set_company($company);
            $this->logged = false;
@@ -76,7 +76,8 @@ class current_user
                if (!isset($Auth_Result))       // if not used: standard method
                        $Auth_Result = get_user_auth($loginname, md5($password));
 
-               write_login_filelog($loginname, $Auth_Result);
+               if ($login_delay > 0)
+                       write_login_filelog($loginname, $Auth_Result);
 
                if ($Auth_Result)
                {