diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-11-16 14:04:53 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-11-16 14:04:53 +0100 |
commit | 9e4246d9571481fe7b80227b1e23dc013771c5af (patch) | |
tree | a051a22d8ecda4a648adcfe11504648f57f60e2a /program/lib/Roundcube/rcube_imap_generic.php | |
parent | 07280e764357fe844c18beb9ada772956735b49e (diff) |
Code improvements and fixes (mostly unused variables and methods)
Diffstat (limited to 'program/lib/Roundcube/rcube_imap_generic.php')
-rw-r--r-- | program/lib/Roundcube/rcube_imap_generic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index d78b526dd..450dcdce2 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -1108,7 +1108,8 @@ class rcube_imap_generic // folder name with spaces. Let's try to handle this situation if (!is_array($items) && ($pos = strpos($response, '(')) !== false) { $response = substr($response, $pos); - $items = $this->tokenizeResponse($response, 1); + $items = $this->tokenizeResponse($response, 1); + if (!is_array($items)) { return $result; } @@ -1704,7 +1705,6 @@ class rcube_imap_generic $encoding = $encoding ? trim($encoding) : 'US-ASCII'; $algorithm = $algorithm ? trim($algorithm) : 'REFERENCES'; $criteria = $criteria ? 'ALL '.trim($criteria) : 'ALL'; - $data = ''; list($code, $response) = $this->execute($return_uid ? 'UID THREAD' : 'THREAD', array($algorithm, $encoding, $criteria)); |