Merge pull request #10967 from annando/api

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 9ff5c205212e7e9c4323310f3291e0ee5945737f..20ac8a36e86289b891da8606ed138df1deadf81e 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -57,7 +57,7 @@ function ostatus_subscribe_content(App $a)
                        $api = $contact['baseurl'] . '/api/';
 
                        // Fetching friends
-                       $curlResult = DI::httpRequest()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
+                       $curlResult = DI::httpClient()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
                        if (!$curlResult->isSuccess()) {
                                DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
@@ -111,7 +111,7 @@ function ostatus_subscribe_content(App $a)
 
        $probed = Contact::getByURL($url);
        if (in_array($probed['network'], Protocol::FEDERATED)) {
-               $result = Contact::createFromProbe($a->user, $probed['url']);
+               $result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $probed['url']);
                if ($result['success']) {
                        $o .= ' - ' . DI::l10n()->t('success');
                } else {