Merge pull request #8803 from MrPetovan/bug/8477-api-photo-item-selectfirstforuser

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index cb99492700ce586cc0f111759bd2bcf627afba65..9f347154044f39334313aa57191b453c24c70d52 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -167,10 +167,9 @@ class Contact extends BaseModule
                        return;
                }
 
-               $uid = $contact['uid'];
-
                if ($contact['network'] == Protocol::OSTATUS) {
-                       $result = Model\Contact::createFromProbe($uid, $contact['url'], false, $contact['network']);
+                       $user = Model\User::getById($contact['uid']);
+                       $result = Model\Contact::createFromProbe($user, $contact['url'], false, $contact['network']);
 
                        if ($result['success']) {
                                DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
@@ -715,15 +714,14 @@ class Contact extends BaseModule
                        $sql_values[] = $group;
                }
 
-               $sql_extra .= Widget::unavailableNetworks();
-
                $total = 0;
                $stmt = DBA::p("SELECT COUNT(*) AS `total`
                        FROM `contact`
                        WHERE `uid` = ?
                        AND `self` = 0
                        AND NOT `deleted`
-                       $sql_extra",
+                       $sql_extra
+                       " . Widget::unavailableNetworks(),
                        $sql_values
                );
                if (DBA::isResult($stmt)) {
@@ -976,7 +974,12 @@ class Contact extends BaseModule
                        $profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
                        Model\Profile::load($a, '', $profiledata, true);
-                       $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
+
+                       if ($contact['uid'] == 0) {
+                               $o .= Model\Contact::getPostsFromId($contact['id'], true, $update);
+                       } else {
+                               $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
+                       }
                }
 
                return $o;
@@ -998,7 +1001,12 @@ class Contact extends BaseModule
                        }
 
                        Model\Profile::load($a, '', $profiledata, true);
-                       $o .= Model\Contact::getPostsFromUrl($contact['url']);
+
+                       if ($contact['uid'] == 0) {
+                               $o .= Model\Contact::getPostsFromId($contact['id']);
+                       } else {
+                               $o .= Model\Contact::getPostsFromUrl($contact['url']);
+                       }
                }
 
                return $o;