MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery

Browse source
This commit is contained in:
Michael Vogel 2015-11-27 07:30:03 +01:00
parent fc250bbc20 3bf789d0e3
commit b45ca80656
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Scrape.php
View file

@ -17,10 +17,12 @@ function scrape_dfrn($url, $dont_probe = false) {
if(! $s) if(! $s)
return $ret; return $ret;
if (!$dont_probe) {
$probe = probe_url($url); $probe = probe_url($url);
if (isset($probe["addr"])) if (isset($probe["addr"]))
$ret["addr"] = $probe["addr"]; $ret["addr"] = $probe["addr"];
}
$headers = $a->get_curl_headers(); $headers = $a->get_curl_headers();
logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG); logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);