From 7bbb86f78aad9c9ed71054e9e5f9ab01a9c04b17 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 19 Sep 2015 02:35:35 -0400
Subject: [PATCH] Session read handler must return a string in PHP7
---
program/lib/Roundcube/rcube_session.php | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index af6a49b..23b1d33 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -157,7 +157,7 @@
$oldvars = $this->get_cache($key);
// if there are cached vars, update store, else insert new data
- if ($oldvars !== null) {
+ if ($oldvars) {
$newvars = $this->_fixvars($vars, $oldvars);
return $this->update($key, $newvars, $oldvars);
}
@@ -267,10 +267,11 @@
}
/**
- * see if we have vars of this key already cached, and if so, return them.
+ * See if we have vars of this key already cached, and if so, return them.
*
- * @param $key
- * @return null|array
+ * @param string $key Session ID
+ *
+ * @return string
*/
protected function get_cache($key)
{
@@ -285,6 +286,7 @@
else { // else read data again
$cache = $this->read($key);
}
+
return $cache;
}
@@ -374,7 +376,7 @@
$node[$k] = $value;
}
- if($this->key) {
+ if ($this->key) {
$data = $this->read($this->key);
}
--
Gitblit v1.9.1