summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-04-20 11:52:43 +0000
committeralecpl <alec@alec.pl>2012-04-20 11:52:43 +0000
commita2f896bdeb2bebd09e85742c2918c79020830212 (patch)
tree78c499e3755259d6dfccdf71c4c52dd09e59a599 /program/include
parent6c95b3e4eee2119634a54f5d50216c49ef662f33 (diff)
- Use user object instead of session, if possible, to get user ID when creating cache object
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/program/include/rcube.php b/program/include/rcube.php
index 780f9b699..66715ed85 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -244,7 +244,8 @@ class rcube
public function get_cache($name, $type='db', $ttl=0, $packed=true)
{
if (!isset($this->caches[$name])) {
- $this->caches[$name] = new rcube_cache($type, $_SESSION['user_id'], $name, $ttl, $packed);
+ $userid = $this->get_user_id();
+ $this->caches[$name] = new rcube_cache($type, $userid, $name, $ttl, $packed);
}
return $this->caches[$name];
@@ -1171,6 +1172,9 @@ class rcube
if (is_object($this->user)) {
return $this->user->ID;
}
+ else if (isset($_SESSION['user_id'])) {
+ return $_SESSION['user_id'];
+ }
return null;
}