From 77cc9688c89be949daabd51b019364ed0ea06065 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 20 Dec 2017 15:57:06 +0100
Subject: [PATCH] Fix bug where contacts export by selection returned no more
 than 10 entries (#6103)

---
 CHANGELOG                            | 1 +
 program/steps/addressbook/export.inc | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 667265311b7..cadda1eb890 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where Archive folder wasn't auto-created on login with create_default_folders=true
 - Fix performance issue when parsing malformed and long Date header (#6087)
 - Fix syntax error in mssql.initial.sql (#6097)
+- Fix bug where contacts export by selection returned no more than 10 entries (#6103)
 
 RELEASE 1.3.3
 -------------
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index ecec53d737c..84c35f64230 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -71,6 +71,11 @@ else if (!empty($_REQUEST['_cid'])) {
 
     foreach ($cids as $s => $ids) {
         $source = $RCMAIL->get_address_book($s);
+
+        // reset page and page size (#6103)
+        $source->set_page(1);
+        $source->set_pagesize(count($ids));
+
         $result = $source->search('ID', $ids, 1, true, true);
 
         while ($record = $result->next()) {