Bugfix: The timeout value of z_fetch_url couldn't be set manually

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index 2815e1ab851e7a4f094e966b13332cfe0f8241ad..d0217e2a084fb45019788a7f49f6c89d991bc11d 100644 (file)
--- 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));
        }