Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-11 10:36:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
program/include/rcube.php
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);
}

4
program/include/rcube_imap.php
View File

@@ -3742,9 +3742,9 @@ class rcube_imap extends rcube_storage
{
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']);
}
}