From b58f11841539035f8fa06c2a0e64dd9199d6a089 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Oct 2008 05:41:32 -0400
Subject: [PATCH] Improve vcard import (#1485502); try utf-8 first in charset detection

---
 program/steps/addressbook/import.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index 93452ec..5949097 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -58,7 +58,7 @@
   global $IMPORT_STATS;
   
   $vars = get_object_vars($IMPORT_STATS);
-  $vars['names'] = join(', ', $IMPORT_STATS->names);
+  $vars['names'] = join(', ', array_map('Q', $IMPORT_STATS->names));
   
   return html::p($attrib, Q(rcube_label(array(
     'name' => 'importconfirm',

--
Gitblit v1.9.1