summaryrefslogtreecommitdiffstats
path: root/apps/contacts/lib
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-03-26 02:04:34 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-03-26 02:04:34 +0200
commit102cf150b3a1de43877878debf9aef5f386d543b (patch)
tree1a86b2023e81e0e05e5f204bfb83b35039c4f33a /apps/contacts/lib
parentec40f69c9e7a6aba39bd74ff1549e70a93357e4f (diff)
downloadnextcloud-server-102cf150b3a1de43877878debf9aef5f386d543b.tar.gz
nextcloud-server-102cf150b3a1de43877878debf9aef5f386d543b.zip
Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA
Diffstat (limited to 'apps/contacts/lib')
-rw-r--r--apps/contacts/lib/vcard.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 3736f18c647..15a6176d40c 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);
}
/**