summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-11-19 15:08:40 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-11-19 15:08:40 +0000
commit4c45c215bb0779bed9dea61bef086390080fc2ee (patch)
tree2cf67c5240a74418c73934c8930a34bd64ddd1dd /roundcubemail/program
parent68b4ac324209df1923a65c616076e601993bf530 (diff)
Correctly set session cookie lifetime if not 0
git-svn-id: https://svn.roundcube.net/trunk@920 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/include/session.inc4
1 files changed, 2 insertions, 2 deletions
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;
}