diff options
| author | friendica <info@friendica.com> | 2015-03-21 16:47:46 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-21 16:47:46 -0700 |
| commit | b298bc8834eb58f202f6cd30d857ef450bf826b4 (patch) | |
| tree | 987983a6e8376948e5629b846ef25b263512b75e /include/network.php | |
| parent | a2e3ca6fd8ba8c0630de089d772fdd668b84428b (diff) | |
| parent | b6b0e00f4c498ac2a9994c844d55098090952e6d (diff) | |
| download | volse-hubzilla-b298bc8834eb58f202f6cd30d857ef450bf826b4.tar.gz volse-hubzilla-b298bc8834eb58f202f6cd30d857ef450bf826b4.tar.bz2 volse-hubzilla-b298bc8834eb58f202f6cd30d857ef450bf826b4.zip | |
Merge https://github.com/friendica/red into pending_merge
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']; } |