Improve reading of vCard files

1 files changed, 2 insertions, 3 deletions

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 68075efc6aa..70b2c8dcf82 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -44,14 +44,13 @@ if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
 	exit();
 }
 
+$vcard = OC_Contacts_Addressbook::parse($card['carddata']);
 // Check if the card is valid
-if( !OC_Contacts_Addressbook::isValidVObject($card['carddata'])){
+if(is_null($vcard)){
 	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!'))));
 	exit();
 }
 
-$vcard = Sabre_VObject_Reader::read($card['carddata']);
-
 $name = $_POST['name'];
 $value = $_POST['value'];
 $parameters = isset($_POST['parameteres'])?$_POST['parameters']:array();