- Use user object instead of session, if possible, to get user ID when crea...

alecpl

2012-04-20 a2f896bdeb2bebd09e85742c2918c79020830212

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

 program/include/rcube.php

@@ -244,7 +244,8 @@
  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 @@
        if (is_object($this->user)) {
            return $this->user->ID;
        }
        else if (isset($_SESSION['user_id'])) {
            return $_SESSION['user_id'];
        }

        return null;
    }