Some more documentation

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 1c99dd02988c114a412ba957345df94437f490c1..d76c8f826cd68846f59f30a6ffd9c2bfdfb51c70 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -129,7 +129,7 @@ function terminate_friendship($user,$self,$contact) {
        }
        elseif($contact['network'] === NETWORK_DIASPORA) {
                require_once('include/diaspora.php');
-               diaspora_unshare($user,$contact);
+               diaspora::send_unshare($user,$contact);
        }
        elseif($contact['network'] === NETWORK_DFRN) {
                require_once('include/dfrn.php');
@@ -486,22 +486,16 @@ function get_contact($url, $uid = 0) {
 
        require_once("Photo.php");
 
-       $photos = import_profile_photo($data["photo"],$uid,$contactid);
+       update_contact_avatar($data["photo"],$uid,$contactid);
 
-       q("UPDATE `contact` SET `avatar` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s',
-               `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
-               `name-date` = '%s', `uri-date` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
-               dbesc($data["photo"]),
-               dbesc($photos[0]),
-               dbesc($photos[1]),
-               dbesc($photos[2]),
+       q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
+               `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
                dbesc($data["addr"]),
                dbesc($data["alias"]),
                dbesc($data["name"]),
                dbesc($data["nick"]),
                dbesc(datetime_convert()),
                dbesc(datetime_convert()),
-               dbesc(datetime_convert()),
                intval($contactid)
        );