summaryrefslogtreecommitdiffstats
path: root/apps/contacts/ajax/deleteproperty.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-01-31 19:26:26 +0100
committerThomas Tanghus <thomas@tanghus.net>2012-01-31 19:30:56 +0100
commit3f1486534f687fdcad219b97072ed71a2998de87 (patch)
tree62137ae8c829291bbc9daf137ad4f813724565ca /apps/contacts/ajax/deleteproperty.php
parentdb1f77e4f51b1172aabe12defdd8228e9dd3b93b (diff)
downloadnextcloud-server-3f1486534f687fdcad219b97072ed71a2998de87.tar.gz
nextcloud-server-3f1486534f687fdcad219b97072ed71a2998de87.zip
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93
Property was added multiple times. - Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8 "Missing "N" field: Contacts app not compatible with vcard 3.0 format" - Almost sure I've fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27 "Full name in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8
Diffstat (limited to 'apps/contacts/ajax/deleteproperty.php')
-rw-r--r--apps/contacts/ajax/deleteproperty.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index 89cf292f4f8..d745d3271db 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -33,6 +33,11 @@ $checksum = $_GET['checksum'];
$vcard = OC_Contacts_App::getContactVCard( $id );
$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
+if(is_null($line)){
+ $l=new OC_L10N('contacts');
+ OC_JSON::error(array('data' => array( 'message' => $l->t('Information about vCard is incorrect. Please reload the page.'))));
+ exit();
+}
unset($vcard->children[$line]);