Merge pull request #2100 from annando/bugfix-scrape

Bugfix: There was an endless loop in the probe_url function ...

include/Scrape.php

@@ -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);