From 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 10:24:09 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
installer/rcube_install.php | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index c1ebdca..e120366 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -342,9 +342,6 @@
}
}
- if ($current['keep_alive'] && $current['session_lifetime'] < $current['keep_alive'])
- $current['session_lifetime'] = max(10, ceil($current['keep_alive'] / 60) * 2);
-
$this->config = array_merge($this->config, $current);
foreach ((array)$current['ldap_public'] as $key => $values) {
@@ -454,7 +451,7 @@
'0.5-beta', '0.5', '0.5.1',
'0.6-beta', '0.6',
'0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
- '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3',
+ '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4',
));
return $select;
}
--
Gitblit v1.9.1