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_result_multifolder.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/program/lib/Roundcube/rcube_result_multifolder.php b/program/lib/Roundcube/rcube_result_multifolder.php
index 188fb26..ac08895 100644
--- a/program/lib/Roundcube/rcube_result_multifolder.php
+++ b/program/lib/Roundcube/rcube_result_multifolder.php
@@ -32,6 +32,7 @@
 
     protected $meta = array();
     protected $index = array();
+    protected $folders = array();
     protected $sorting;
     protected $order = 'ASC';
 
@@ -39,8 +40,9 @@
     /**
      * Object constructor.
      */
-    public function __construct()
+    public function __construct($folders = array())
     {
+        $this->folders = $folders;
         $this->meta = array('count' => 0);
     }
 
@@ -228,6 +230,7 @@
         $params = array(
             'SORT' => $this->sorting,
             'ORDER' => $this->order,
+            'MAILBOX' => $this->folders,
         );
 
         if ($param !== null) {

--
Gitblit v1.9.1