From fe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 21 Aug 2012 04:50:14 -0400
Subject: [PATCH] Fix possible PHP warning, read default_folders using config->get() to support deprecated option name (default_imap_folders)
---
program/include/rcube_session.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index e3b5600..6192466 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -312,7 +312,8 @@
public function mc_destroy($key)
{
if ($key) {
- $this->memcache->delete($key);
+ // #1488592: use 2nd argument
+ $this->memcache->delete($key, 0);
}
return true;
@@ -530,7 +531,7 @@
public function set_keep_alive($keep_alive)
{
$this->keep_alive = $keep_alive;
-
+
if ($this->lifetime < $keep_alive)
$this->set_lifetime($keep_alive + 30);
}
@@ -550,7 +551,7 @@
{
return $this->ip;
}
-
+
/**
* Setter for cookie encryption secret
*/
@@ -567,7 +568,8 @@
{
$this->ip_check = $check;
}
-
+
+
/**
* Setter for the cookie name used for session cookie
*/
@@ -604,7 +606,7 @@
$result = true;
}
}
- }
+ }
if (!$result)
$this->log("Session authentication failed for " . $this->key . "; invalid auth cookie sent; timeslot = " . date('Y-m-d H:i:s', $prev));
@@ -636,7 +638,7 @@
}
/**
- *
+ * Writes debug information to the log
*/
function log($line)
{
--
Gitblit v1.9.1