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

This commit is contained in:
Thomas Bruederli
2012-06-20 18:39:54 +02:00
parent 1fe450b5aa
commit 6bb44a644a
2 changed files with 6 additions and 5 deletions

View File

@@ -106,12 +106,14 @@ class rcube
/**
* 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);
}
return self::$instance;
@@ -240,8 +242,7 @@ class rcube
*/
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);
}