From e8cb51669a325a3d5b60fcc37b99d494809bf837 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 07 Apr 2014 10:24:37 -0400
Subject: [PATCH] More fixes for multi-folder search (#1485234)
---
program/lib/Roundcube/rcube_imap_search.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/program/lib/Roundcube/rcube_imap_search.php b/program/lib/Roundcube/rcube_imap_search.php
index c881981..926a75d 100644
--- a/program/lib/Roundcube/rcube_imap_search.php
+++ b/program/lib/Roundcube/rcube_imap_search.php
@@ -65,6 +65,8 @@
{
$pthreads = defined('PTHREADS_INHERIT_ALL');
+ $results = new rcube_result_multifolder($folders);
+
// start a search job for every folder to search in
foreach ($folders as $folder) {
$job = new rcube_imap_search_job($folder, $str, $charset, $sort_field, $threading);
@@ -82,7 +84,6 @@
$this->shutdown();
// gather results
- $results = new rcube_result_multifolder;
foreach ($this->jobs as $job) {
$results->add($job->get_result());
}
--
Gitblit v1.9.1