diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-06-10 20:54:52 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-06-10 20:56:55 +0200 |
| commit | 40f8419fdf5891ca419d20699b7fc89cd3472afb (patch) | |
| tree | 4b587275418e3665300be054188d5af338e3de6f /apps | |
| parent | bf4626da931b5120762f899cbcb42034244856ed (diff) | |
| download | nextcloud-server-40f8419fdf5891ca419d20699b7fc89cd3472afb.tar.gz nextcloud-server-40f8419fdf5891ca419d20699b7fc89cd3472afb.zip | |
Contacts: 11th hour fix for invalid VCARD from CardDAV.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/lib/vcard.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index a8ad695f620..20a9e4afc9c 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -373,6 +373,10 @@ class OC_Contacts_VCard{ public static function editFromDAVData($aid,$uri,$data){ $oldcard = self::findWhereDAVDataIs($aid,$uri); $card = OC_VObject::parse($data); + if(!$card) { + OCP\Util::writeLog('contacts','OC_Contacts_VCard::editFromDAVData. Unable to parse VCARD, uri: '.$uri,OCP\Util::ERROR); + return false; + } return self::edit($oldcard['id'], $card); } |