From e61e40c23db8ed4056e9a41b32005d679ff40978 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Fri, 4 May 2012 01:27:59 +0200 Subject: [PATCH] Contacts: Hack around malformed BDAY. --- apps/contacts/lib/vcard.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index 4be6819054..621a3c33c7 100755 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -475,9 +475,15 @@ class OC_Contacts_VCard{ //$value = htmlspecialchars($value); if($property->name == 'ADR' || $property->name == 'N'){ $value = self::unescapeDelimiters($value); - }/* elseif($property->name == 'CATEGORIES') { - $value = self::unescapeDelimiters($value, ','); - }*/ + } elseif($property->name == 'BDAY') { + if(strpos($value, '-') === false) { + if(strlen($value) >= 8) { + $value = substr($value, 0, 4).'-'.substr($value, 4, 2).'-'.substr($value, 6, 2); + } else { + return null; // Badly malformed :-( + } + } + } $temp = array( 'name' => $property->name, 'value' => $value,