From 102cf150b3a1de43877878debf9aef5f386d543b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 26 Mar 2012 02:04:34 +0200
Subject: [PATCH] Fixed error in OC_Contacts_VCard::addFromDAVData as pointed
out by Guillaume ZITTA
---
apps/contacts/lib/vcard.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 3736f18c64..15a6176d40 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -228,7 +228,7 @@ class OC_Contacts_VCard{
* @param string $uri the uri of the card, default based on the UID
* @return insertid on success or null if no card.
*/
- public static function add($aid, $card, $uri=null){
+ public static function add($aid, OC_VObject $card, $uri=null){
if(is_null($card)){
OC_Log::write('contacts','OC_Contacts_VCard::add. No vCard supplied', OC_Log::ERROR);
return null;
@@ -267,7 +267,7 @@ class OC_Contacts_VCard{
*/
public static function addFromDAVData($id,$uri,$data){
$card = OC_VObject::parse($data);
- return self::add($id, $data, $uri);
+ return self::add($id, $card, $uri);
}
/**
--
GitLab