Merge pull request #1566 from annando/1505-bugfix-fetch-url
Bugfix: The function "z_fetch_url" created warnings
This commit is contained in:
commit
53a2121797
1 changed files with 9 additions and 11 deletions
|
@ -18,8 +18,6 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
||||||
'cookiejar'=>$cookiejar
|
'cookiejar'=>$cookiejar
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return($ret['body']);
|
return($ret['body']);
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
@ -154,7 +152,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
|
||||||
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
|
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
|
||||||
$redirects++;
|
$redirects++;
|
||||||
@curl_close($ch);
|
@curl_close($ch);
|
||||||
return fetch_url($newurl,$binary,$redirects,$timeout,$accept_content,$cookiejar);
|
return z_fetch_url($newurl,$binary, $redirects, $opts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue