strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6306 from annando/curl-fix

Browse source 
The curl result is an object, not an array
This commit is contained in:
Hypolite Petovan 2018-12-22 14:35:30 -05:00 committed by GitHub
commit 1c2e5ae708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 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;
$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');

2
src/Network/Probe.php
View file

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