Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 81eced22e7cb0e12ca716e1e1ba298b7805549cd..e8ba144a1633a7b2e5d30d4a35ffb502096eab73 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -29,21 +29,24 @@ function ostatus_subscribe_content(App $a) {
        if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
 
                if ($_REQUEST["url"] == "") {
+                       PConfig::delete($uid, "ostatus", "legacy_contact");
                        return $o.L10n::t("No contact provided.");
                }
 
                $contact = Probe::uri($_REQUEST["url"]);
 
                if (!$contact) {
+                       PConfig::delete($uid, "ostatus", "legacy_contact");
                        return $o.L10n::t("Couldn't fetch information for contact.");
                }
 
                $api = $contact["baseurl"]."/api/";
 
                // Fetching friends
-               $data = Network::zFetchURL($api."statuses/friends.json?screen_name=".$contact["nick"]);
+               $data = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
 
                if (!$data["success"]) {
+                       PConfig::delete($uid, "ostatus", "legacy_contact");
                        return $o.L10n::t("Couldn't fetch friends for contact.");
                }