X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnetwork.php;h=d0217e2a084fb45019788a7f49f6c89d991bc11d;hb=98f524db67a73565f0a03bd9b4d1a557f6b3e99a;hp=2815e1ab851e7a4f094e966b13332cfe0f8241ad;hpb=05b2836d660c043d00b204c05463e720bb72f62a;p=friendica.git

diff --git a/include/network.php b/include/network.php
index 2815e1ab85..d0217e2a08 100644
--- a/include/network.php
+++ b/include/network.php
@@ -86,10 +86,9 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 	if(x($opts,'nobody')){
 		@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 	}
-	if(intval($timeout)) {
-		@curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-	}
-	else {
+	if(x($opts,'timeout')){
+		@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
+	} else {
 		$curl_time = intval(get_config('system','curl_timeout'));
 		@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
 	}