Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert commit d08cb111 "Fixed working with disabled kolab_cache"

Browse source 
This reverts commit d08cb11137.
This commit is contained in:
Thomas Bruederli 2012-05-16 10:12:22 +02:00
parent 4b5c2ce985
commit 3a1f2c207c
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/libkolab/lib/kolab_storage_cache.php
View file

@ -82,8 +82,7 @@ class kolab_storage_cache
return; return;
// lock synchronization for this folder or wait if locked // lock synchronization for this folder or wait if locked
if (!$this->_sync_lock()) $this->_sync_lock();
return;
// synchronize IMAP mailbox cache // synchronize IMAP mailbox cache
$this->imap->folder_sync($this->folder->name); $this->imap->folder_sync($this->folder->name);
@ -306,7 +305,7 @@ class kolab_storage_cache
$filter = $this->_query2assoc($query); $filter = $this->_query2assoc($query);
// use 'list' for folder's default objects // use 'list' for folder's default objects
if ($filter['type'] == $this->type && !empty($this->index)) { if ($filter['type'] == $this->type) {
$index = $this->index; $index = $this->index;
} }
else { // search by object type else { // search by object type
@ -489,7 +488,7 @@ class kolab_storage_cache
private function _sync_lock() private function _sync_lock()
{ {
if (!$this->ready) if (!$this->ready)
return false; return;
$sql_arr = $this->db->fetch_assoc($this->db->query( $sql_arr = $this->db->fetch_assoc($this->db->query(
"SELECT msguid AS locked, ".$this->db->unixtimestamp('created')." AS created FROM kolab_cache ". "SELECT msguid AS locked, ".$this->db->unixtimestamp('created')." AS created FROM kolab_cache ".
@ -523,8 +522,6 @@ class kolab_storage_cache
'lock' 'lock'
); );
} }
return true;
} }
/** /**