Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2014-05-15 eb62a816fba72e54361a1407d962082443d4b041

 program/lib/Roundcube/rcube_imap_search.php

@@ -65,7 +65,8 @@
                $results->add($result);
            }
            else {
                $job = new rcube_imap_search_job($folder, $str, $charset, $sort_field, $threading);
                $search = is_array($str) && $str[$folder] ? $str[$folder] : $str;
                $job = new rcube_imap_search_job($folder, $search, $charset, $sort_field, $threading);
                $job->worker = $this;
                $this->jobs[] = $job;
            }
@@ -151,7 +152,6 @@
    {
        $criteria = $this->search;
        $charset = $this->charset;

        $imap = $this->worker->get_imap();

        if (!$imap->connected()) {
@@ -228,7 +228,4 @@
    {
        return $this->result;
    }

}