diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2012-06-26 16:30:34 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2012-06-26 16:30:34 +0200 |
| commit | de4a540ce6349e7f901be412fb24899b188b3414 (patch) | |
| tree | f56099432b0c6a8ab330a06ddf45f0eb9a05447d | |
| parent | 7dc72a48cc15b02b8dc6a380c4edcc826b04378f (diff) | |
| parent | 46e93168cdacdf49552f39a548d99a4a04f6ca30 (diff) | |
| download | nextcloud-server-de4a540ce6349e7f901be412fb24899b188b3414.tar.gz nextcloud-server-de4a540ce6349e7f901be412fb24899b188b3414.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
| -rw-r--r-- | apps/contacts/lib/vcard.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index 0f3a08844b1..22c546b2c4c 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -403,7 +403,7 @@ class OC_Contacts_VCard{ */ public static function deleteFromDAVData($aid,$uri){ // FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error. - OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uid)); + OC_Hook::emit('OC_Contacts_VCard', 'pre_deleteVCard', array('aid' => $aid, 'id' => null, 'uri' => $uri)); $stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' ); $stmt->execute(array($aid,$uri)); OC_Contacts_Addressbook::touch($aid); |