X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FScrape.php;h=0169f55fd5d93db839d0dfa77250a8fc81fac0be;hb=1f0b759e2f6df7af4bc55571168bad3e3acbcd76;hp=83c099769d456d851175ec9dcffba9f2e37a7c5f;hpb=749a646480f6352af3b9a912811fdc182c0b7c4e;p=friendica.git diff --git a/include/Scrape.php b/include/Scrape.php index 83c099769d..0169f55fd5 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -552,7 +552,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) { if($diaspora) $network = NETWORK_DIASPORA; - elseif($has_lrdd) + elseif($has_lrdd AND ($notify)) $network = NETWORK_OSTATUS; if(strpos($url,'@')) @@ -652,9 +652,10 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { $feed->set_raw_data(($xml) ? $xml : ''); $feed->init(); - if($feed->error()) + if($feed->error()) { logger('probe_url: scrape_feed: Error parsing XML: ' . $feed->error()); - + $network = NETWORK_PHANTOM; + } if(! x($vcard,'photo')) $vcard['photo'] = $feed->get_image_url(); @@ -819,7 +820,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { } } - Cache::set("probe_url:".$mode.":".$url,serialize($result)); + // Only store into the cache if the value seems to be valid + if ($result['network'] != NETWORK_FEED) + Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY); return $result; }