Changeset a2f896b in github

Timestamp:

Apr 20, 2012 7:52:43 AM (13 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo

Children:

b1b808d

Parents:

6c95b3e4

Message:

• Use user object instead of session, if possible, to get user ID when creating cache object

File:

• program/include/rcube.php (modified) (2 diffs)

program/include/rcube.php

@@ -245 +245 @@
   {
     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);
     }
 
@@ -1172 +1173 @@
             return $this->user->ID;
         }
+        else if (isset($_SESSION['user_id'])) {
+            return $_SESSION['user_id'];
+        }
 
         return null;