Merge pull request #6310 from annando/issue-6122

Handles issue 6122 - the self contact will be updated when invalid

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 5670820623449c1e65f2c77da79c09b3e32b71ed..5d493db32c74b2fce0a7e7eeb5ac5c52face3a21 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -77,8 +77,8 @@ function ostatus_subscribe_content(App $a)
 
        $o .= '<p>' . $counter . '/' . $total . ': ' . $url;
 
-       $curlResult = Probe::uri($url);
-       if ($curlResult['network'] == Protocol::OSTATUS) {
+       $probed = Probe::uri($url);
+       if ($probed['network'] == Protocol::OSTATUS) {
                $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
                if ($result['success']) {
                        $o .= ' - ' . L10n::t('success');

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index f4e3d1d43c55d433f875b840a781dac3171bceb4..b4e297afa2096b9aac07dd5ddcf51bfbcede087c 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -1317,7 +1317,7 @@ class Probe
                                                if ($curlResult->isTimeout()) {
                                                        return false;
                                                }
-                                               $pubkey = $curlResult['body'];
+                                               $pubkey = $curlResult->getBody();
                                        }
 
                                        $key = explode(".", $pubkey);