Merge commit 'debian/0.5.1+dfsg-5' into debian

[roundcube.git] / program / steps / addressbook / export.inc

diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index d49fbe997eccdb9d09e94d879f288a37c1731fcd..98f8b927352c067ef38ef0b13a99cda59ee8616a 100644 (file)
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/addressbook/export.inc                                  |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -21,12 +21,12 @@
 
 // get contacts for this user
 $CONTACTS->set_page(1);
-$CONTACTS->set_pagesize(999);
-$result = $CONTACTS->list_records();
+$CONTACTS->set_pagesize(99999);
+$result = $CONTACTS->list_records(null, 0, true);
 
 // send downlaod headers
 send_nocacheing_headers();
-header('Content-Type: text/x-vcard; charset=UTF-8');
+header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
 header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
 
 while ($result && ($row = $result->next())) {
@@ -41,4 +41,3 @@ while ($result && ($row = $result->next())) {
 
 exit;
 
-?>