Merge pull request #6306 from annando/curl-fix
The curl result is an object, not an array
This commit is contained in:
commit
1c2e5ae708
|
@ -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');
|
||||
|
|
|
@ -1317,7 +1317,7 @@ class Probe
|
|||
if ($curlResult->isTimeout()) {
|
||||
return false;
|
||||
}
|
||||
$pubkey = $curlResult['body'];
|
||||
$pubkey = $curlResult->getBody();
|
||||
}
|
||||
|
||||
$key = explode(".", $pubkey);
|
||||
|
|
Loading…
Reference in a new issue