- Add threads() result checking

release-0.6
alecpl 14 years ago
parent 0f9d8ca40d
commit e9a974990e

@ -904,14 +904,14 @@ class rcube_imap
{ {
if (empty($this->icache['threads'])) { if (empty($this->icache['threads'])) {
// get all threads // get all threads
list ($thread_tree, $msg_depth, $has_children) = $this->conn->thread( $result = $this->conn->thread($mailbox, $this->threading,
$mailbox, $this->threading, $this->skip_deleted ? 'UNDELETED' : ''); $this->skip_deleted ? 'UNDELETED' : '');
// add to internal (fast) cache // add to internal (fast) cache
$this->icache['threads'] = array(); $this->icache['threads'] = array();
$this->icache['threads']['tree'] = $thread_tree; $this->icache['threads']['tree'] = is_array($result) ? $result[0] : array();
$this->icache['threads']['depth'] = $msg_depth; $this->icache['threads']['depth'] = is_array($result) ? $result[1] : array();
$this->icache['threads']['has_children'] = $has_children; $this->icache['threads']['has_children'] = is_array($result) ? $result[2] : array();
} }
return array( return array(
@ -1692,7 +1692,7 @@ class rcube_imap
return $a_messages; return $a_messages;
} }
if ($sort_field && $this->get_capability('SORT')) { if ($sort_field && $this->get_capability('SORT')) {
$charset = $charset ? $charset : $this->default_charset; $charset = $charset ? $charset : $this->default_charset;
$a_messages = $this->conn->sort($mailbox, $sort_field, $criteria, false, $charset); $a_messages = $this->conn->sort($mailbox, $sort_field, $criteria, false, $charset);

Loading…
Cancel
Save