From: Michael Vogel <icarus@dabo.de>
Date: Fri, 27 Nov 2015 06:30:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b45ca806565b64e4f30156f8374f6d0c24a670ee;hp=fc250bbc2041b7571e126ec56974221f3c2f789b;p=friendica.git

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

diff --git a/include/Scrape.php b/include/Scrape.php
index 64a930bfda..4f9d675c18 100644
--- a/include/Scrape.php
+++ b/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);