From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 24 Aug 2009 10:49:37 +0000 (+0000)
Subject: Fixed warning displayed before 2.2 db upgrade.
X-Git-Tag: v2.4.2~19^2~1301
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=7e8c90ee7e898a9181f62f387ccb92158f47f59c

Fixed warning displayed before 2.2 db upgrade.
---

diff --git a/includes/current_user.inc b/includes/current_user.inc
index ee9e38f0..549c31b0 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -347,6 +347,7 @@ function add_user_js_data() {
 
 function session_timeout()
 {
-	return get_company_pref('login_tout');
+	$tout = @get_company_pref('login_tout'); // mask warning for db ver. 2.2
+	return $tout ? $tout : ini_get('session.gc_maxlifetime');
 }
 ?>
\ No newline at end of file