From 37757464fd4d603b7f8cd3038d5c85a2f92de855 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 7 Jan 2015 17:04:21 +0100 Subject: Correctly handle DateTime values in Vcard export --- program/steps/addressbook/export.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'program') diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc index 2b45e5cd1..11e8f2aa8 100644 --- a/program/steps/addressbook/export.inc +++ b/program/steps/addressbook/export.inc @@ -131,8 +131,13 @@ function prepare_for_export(&$record, $source = null) foreach ($record as $key => $values) { list($field, $section) = explode(':', $key); - foreach ((array)$values as $value) { - if (is_array($value) || @strlen($value)) { + // avoid casting DateTime objects to array + // (same as in rcube_contacts::convert_save_data()) + if (is_object($values) && is_a($values, 'DateTime')) { + $values = array(0 => $values); + } + foreach ($values as $value) { + if (is_array($value) || is_a($value, 'DateTime') || @strlen($value)) { $vcard->set($field, $value, strtoupper($section)); } } -- cgit v1.2.3