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

Don't set error state on simple arrays; simplify query

Browse source
This commit is contained in:
Thomas Bruederli 2014-02-10 09:27:16 +01:00
parent 816356813c
commit 22a1c7a7ee
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,19 +447,19 @@ class kolab_storage_cache
// fetch full object data on one query if a small result set is expected
$fetchall = !$uids && $this->count($query) < 500;
$sql_result = $this->db->query(
"SELECT " . (!$fetchall ? 'msguid, msguid AS _msguid, uid' : '*') . " FROM $this->cache_table ".
"SELECT " . ($fetchall ? '*' : 'msguid AS _msguid, uid') . " FROM $this->cache_table ".
"WHERE folder_id=? " . $this->_sql_where($query),
$this->folder_id
);
if ($this->db->is_error($sql_result)) {
$result->set_error(true);
if (!$uids) $result->set_error(true);
return $result;
}
while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
if ($uids) {
$this->uid2msg[$sql_arr['uid']] = $sql_arr['msguid'];
$this->uid2msg[$sql_arr['uid']] = $sql_arr['_msguid'];
$result[] = $sql_arr['uid'];
}
else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
@ -484,7 +484,7 @@ class kolab_storage_cache
}
if ($index->is_error()) {
$result->set_error(true);
if (!$uids) $result->set_error(true);
return $result;
}