friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

The curl result is an object, not an array

This commit is contained in:
Michael 2018-12-22 17:00:28 +00:00
parent 92214b8867
commit c06f7ad11e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/ostatus_subscribe.php
View File

@ -77,8 +77,8 @@ function ostatus_subscribe_content(App $a)
$o .= '<p>' . $counter . '/' . $total . ': ' . $url; $o .= '<p>' . $counter . '/' . $total . ': ' . $url;
$curlResult = Probe::uri($url); $probed = Probe::uri($url);
if ($curlResult['network'] == Protocol::OSTATUS) { if ($probed['network'] == Protocol::OSTATUS) {
$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS); $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
if ($result['success']) { if ($result['success']) {
$o .= ' - ' . L10n::t('success'); $o .= ' - ' . L10n::t('success');

2
src/Network/Probe.php
View File

@ -1317,7 +1317,7 @@ class Probe
if ($curlResult->isTimeout()) { if ($curlResult->isTimeout()) {
return false; return false;
} }
$pubkey = $curlResult['body']; $pubkey = $curlResult->getBody();
} }
$key = explode(".", $pubkey); $key = explode(".", $pubkey);

2
src/Protocol/PortableContact.php
View File

@ -1778,7 +1778,7 @@ class PortableContact
$curlResult = Network::curl($url); $curlResult = Network::curl($url);
if ($curlResult->isSuccess()) { if ($curlResult->isSuccess()) {
$data = json_decode($curlResult["body"], true); $data = json_decode($curlResult->getBody(), true);
if (!empty($data)) { if (!empty($data)) {
self::discoverServer($data, 3); self::discoverServer($data, 3);