diff options
| author | RedMatrix <info@friendica.com> | 2015-03-22 08:39:28 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2015-03-22 08:39:28 +1100 |
| commit | b6b0e00f4c498ac2a9994c844d55098090952e6d (patch) | |
| tree | 8fa8ef8647ba090ae0e9757688e6139c250bf73e /include/network.php | |
| parent | 5a1c388d4a3216263d4ec4c0b0dee13e654f20c2 (diff) | |
| parent | 9d143e3f2dae4bd24b234a00dce7f0a59f24f470 (diff) | |
| download | volse-hubzilla-b6b0e00f4c498ac2a9994c844d55098090952e6d.tar.gz volse-hubzilla-b6b0e00f4c498ac2a9994c844d55098090952e6d.tar.bz2 volse-hubzilla-b6b0e00f4c498ac2a9994c844d55098090952e6d.zip | |
Merge pull request #934 from dawnbreak/master
Bugfix und variable initialization.
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php index 5912ad79d..6aefc0b30 100644 --- a/include/network.php +++ b/include/network.php @@ -32,8 +32,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { $ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => ""); - $a = get_app(); - $ch = @curl_init($url); if(($redirects > 8) || (! $ch)) return false; @@ -71,7 +69,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); - $prx = get_config('system','proxy'); if(strlen($prx)) { @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); @@ -518,6 +515,7 @@ function allowed_email($email) { function avatar_img($email) { + $avatar = array(); $a = get_app(); $avatar['size'] = 175; @@ -527,10 +525,11 @@ function avatar_img($email) { call_hooks('avatar_lookup', $avatar); - if(! $avatar['success']) + if (! $avatar['success']) $avatar['url'] = $a->get_baseurl() . '/' . get_default_profile_photo(); logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG); + return $avatar['url']; } |