From eb40104d5b5c82ae5d2e5e5b12988a2fe6520244 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 23 Oct 2012 15:15:54 +0000 Subject: [PATCH] Fix birthday import, rename job title column in default definition --- addressbook/inc/class.addressbook_import_contacts_csv.inc.php | 2 +- addressbook/setup/importexport_default.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_import_contacts_csv.inc.php b/addressbook/inc/class.addressbook_import_contacts_csv.inc.php index ddaf61e701..575ea299e8 100644 --- a/addressbook/inc/class.addressbook_import_contacts_csv.inc.php +++ b/addressbook/inc/class.addressbook_import_contacts_csv.inc.php @@ -144,7 +144,7 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv { if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private); // Format birthday as backend requires - converter should give timestamp - if(isset($record->bday) && is_numeric($record->bday)) + if($record->bday && is_numeric($record->bday)) { $time = new egw_time($record->bday); $record->bday = $time->format('Y-m-d'); diff --git a/addressbook/setup/importexport_default.xml b/addressbook/setup/importexport_default.xml index fd1991b098..41e18e14cb 100644 --- a/addressbook/setup/importexport_default.xml +++ b/addressbook/setup/importexport_default.xml @@ -217,7 +217,7 @@ Birthday Company Department - title + Job Title Role Assistent Room