From 4c45c215bb0779bed9dea61bef086390080fc2ee Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 19 Nov 2007 15:08:40 +0000
Subject: Correctly set session cookie lifetime if not 0

git-svn-id: https://svn.roundcube.net/trunk@920 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/session.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/session.inc b/roundcubemail/program/include/session.inc
index 8a98fadde..a29eabba9 100644
--- a/roundcubemail/program/include/session.inc
+++ b/roundcubemail/program/include/session.inc
@@ -173,8 +173,8 @@ function sess_regenerate_id()
 
   session_id($random);
   $cookie = session_get_cookie_params();
-  setcookie(session_name(), "", time() -3600);
-  setcookie(session_name(), $random, $cookie['lifetime'], $cookie['path']);
+  setcookie(session_name(), "", time() - 3600);
+  setcookie(session_name(), $random, $cookie['lifetime'] ? time() + $cookie['lifetime'] : 0, $cookie['path']);
 
   return true;
   }
-- 
cgit v1.2.3