summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-04-18 16:39:41 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-04-18 16:39:41 +0200
commit26b5200322dbb1b52333f7e2db1c303ef0ace1f4 (patch)
tree8bb9078d3af04968ac9ae70db64ca7aea70327eb /program/lib
parent8087b13d20019b506b701bc8f5e5d6d2a0fa6a54 (diff)
Consider search scope (and changes) for filter searches + disable folder operation commands in multi-folder search mode (#1485234)
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_imap.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index baca052b8..b3ae9608c 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -1492,7 +1492,7 @@ class rcube_imap extends rcube_storage
* @param string $str Search criteria
* @param string $charset Search charset
* @param string $sort_field Header field to sort by
- *
+ * @return rcube_result_index Search result object
* @todo: Search criteria should be provided in non-IMAP format, eg. array
*/
public function search($folder='', $str='ALL', $charset=NULL, $sort_field=NULL)
@@ -1531,6 +1531,8 @@ class rcube_imap extends rcube_storage
$this->set_search_set(array($str, $results, $charset, $sort_field,
$this->threading || $this->search_sorted ? true : false));
+
+ return $results;
}