From ae73c26f29aa230ba5ae3d86ef6d0c7886b7e657 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 16 Feb 2015 05:22:40 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/steps/addressbook/export.inc | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index d2507c1..c2f22cb 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -133,12 +133,13 @@
foreach ($record as $key => $values) {
list($field, $section) = explode(':', $key);
- // avoid casting DateTime objects to array
+ // avoid unwanted casting of DateTime objects to an array
// (same as in rcube_contacts::convert_save_data())
if (is_object($values) && is_a($values, 'DateTime')) {
- $values = array(0 => $values);
+ $values = array($values);
}
- foreach ($values as $value) {
+
+ foreach ((array) $values as $value) {
if (is_array($value) || is_a($value, 'DateTime') || @strlen($value)) {
$vcard->set($field, $value, strtoupper($section));
}
--
Gitblit v1.9.1