diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-11-15 09:34:08 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-11-15 09:34:08 +0100 |
| commit | 8d54286df87e21673c05f091e38ca4de14aae326 (patch) | |
| tree | d60c6d6765f5beafe4966352ebbd52e4c9c9661b /installer | |
| parent | 82d875769cade12b82aeab6723c869d87fb7a4c9 (diff) | |
| parent | f226549d4f8f258deca9e165ef857252b79d2ee0 (diff) | |
Merge branch 'keep-alive'
Conflicts:
CHANGELOG
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/rcube_install.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/installer/rcube_install.php b/installer/rcube_install.php index cbeb1655d..e120366ab 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -342,9 +342,6 @@ class rcube_install } } - 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) { |