Fixed warning displayed before 2.2 db upgrade.

diff --git a/includes/current_user.inc b/includes/current_user.inc
index ee9e38f05c06c54718af2d653707c52c03396ffa..549c31b045897cf31ea57d23fa94d86a3ec40b8e 100644 (file)
--- 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