Session read handler must return a string in PHP7

pull/260/merge
Aleksander Machniak 9 years ago
parent b2b9b591ce
commit 7bbb86f78a

@ -157,7 +157,7 @@ abstract class rcube_session
$oldvars = $this->get_cache($key); $oldvars = $this->get_cache($key);
// if there are cached vars, update store, else insert new data // if there are cached vars, update store, else insert new data
if ($oldvars !== null) { if ($oldvars) {
$newvars = $this->_fixvars($vars, $oldvars); $newvars = $this->_fixvars($vars, $oldvars);
return $this->update($key, $newvars, $oldvars); return $this->update($key, $newvars, $oldvars);
} }
@ -267,10 +267,11 @@ abstract class rcube_session
} }
/** /**
* 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 * @param string $key Session ID
* @return null|array *
* @return string
*/ */
protected function get_cache($key) protected function get_cache($key)
{ {
@ -285,6 +286,7 @@ abstract class rcube_session
else { // else read data again else { // else read data again
$cache = $this->read($key); $cache = $this->read($key);
} }
return $cache; return $cache;
} }
@ -374,7 +376,7 @@ abstract class rcube_session
$node[$k] = $value; $node[$k] = $value;
} }
if($this->key) { if ($this->key) {
$data = $this->read($this->key); $data = $this->read($this->key);
} }

@ -108,6 +108,8 @@ class rcube_session_db extends rcube_session
return !empty($this->vars) ? (string) $this->vars : ''; return !empty($this->vars) ? (string) $this->vars : '';
} }
return '';
} }
/** /**

@ -169,6 +169,8 @@ class rcube_session_redis extends rcube_session {
return !empty($this->vars) ? (string) $this->vars : ''; return !empty($this->vars) ? (string) $this->vars : '';
} }
return '';
} }
/** /**

Loading…
Cancel
Save