Changeset 6bb44a6 in github

Timestamp:

Jun 20, 2012 12:39:54 PM (11 months ago)

Author:

Thomas Bruederli <thomas@…>

Branches:

master, HEAD

Children:

7dc7eb1

Parents:

1fe450b

Message:

Initialize rcube instance (with options); no caches without a valid user_id

Location:

program/include

Files:

• rcube.php (modified) (2 diffs)
• rcube_imap.php (modified) (1 diff)

program/include/rcube.php

@@ -107 +107 @@
    * This implements the 'singleton' design pattern
    *
+   * @param integer Options to initialize with this instance. See rcube::INIT_WITH_* constants
    * @return rcube The one and only instance
    */
-  static function get_instance()
+  static function get_instance($mode = 0)
   {
     if (!self::$instance) {
       self::$instance = new rcube();
+      self::$instance->init($mode);
     }
 
@@ -241 +243 @@
   public function get_cache($name, $type='db', $ttl=0, $packed=true)
   {
-    if (!isset($this->caches[$name])) {
-      $userid = $this->get_user_id();
+    if (!isset($this->caches[$name]) && ($userid = $this->get_user_id())) {
       $this->caches[$name] = new rcube_cache($type, $userid, $name, $ttl, $packed);
     }

program/include/rcube_imap.php

@@ -3743 +3743 @@
         if ($this->messages_caching && !$this->mcache) {
             $rcube = rcube::get_instance();
-            if ($dbh = $rcube->get_dbh()) {
+            if (($dbh = $rcube->get_dbh()) && ($userid = $rcube->get_user_id())) {
                 $this->mcache = new rcube_imap_cache(
-                    $dbh, $this, $rcube->get_user_id(), $this->options['skip_deleted']);
+                    $dbh, $this, $userid, $this->options['skip_deleted']);
             }
         }