clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1566 from annando/1505-bugfix-fetch-url 

Bugfix: The function "z_fetch_url" created warnings
This commit is contained in:
fabrixxm 2015-05-17 15:19:38 +02:00
parent 72e3ffbb4d 2038e65a57
commit 53a2121797
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/network.php
View File

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