Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
This commit is contained in:
commit
b45ca80656
1 changed files with 5 additions and 3 deletions
|
@ -17,10 +17,12 @@ function scrape_dfrn($url, $dont_probe = false) {
|
|||
if(! $s)
|
||||
return $ret;
|
||||
|
||||
$probe = probe_url($url);
|
||||
if (!$dont_probe) {
|
||||
$probe = probe_url($url);
|
||||
|
||||
if (isset($probe["addr"]))
|
||||
$ret["addr"] = $probe["addr"];
|
||||
if (isset($probe["addr"]))
|
||||
$ret["addr"] = $probe["addr"];
|
||||
}
|
||||
|
||||
$headers = $a->get_curl_headers();
|
||||
logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);
|
||||
|
|
Loading…
Reference in a new issue