From eec77c1a9938c0c93b580a8804ee54c9f36094c5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 27 Dec 2016 05:57:11 -0500
Subject: [PATCH] Fix some advanced search issues with multiple addressbooks
 (#5572)

---
 CHANGELOG                            |  1 +
 program/steps/addressbook/search.inc | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 05f59e090..0b30ce330 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -82,6 +82,7 @@ CHANGELOG Roundcube Webmail
 - Enigma: Fix PHP fatal error when decrypting a message with invalid signature (#5555)
 - Fix adding images to new identity signatures
 - Fix rsync error handling in installto.sh script (#5562)
+- Fix some advanced search issues with multiple addressbooks (#5572)
 
 RELEASE 1.2.3
 -------------
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index 6a938cef8..8444f8a17 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -240,6 +240,16 @@ function rcmail_contact_search()
     // Re-set list header
     $OUTPUT->command('set_group_prop', null);
 
+    if ($adv) {
+        $OUTPUT->command('parent.set_env', array(
+                'search_request' => $search_request,
+                'pagecount'      => ceil($result->count / $PAGE_SIZE),
+                'search_id'      => $sid,
+                'source'         => '',
+                'group'          => '',
+        ));
+    }
+
     if (!$sid) {
         // unselect currently selected directory/group
         $OUTPUT->command('unselect_directory');