Load config for new get_proxy function (#6247)

This commit is contained in:
pblasquez
2017-03-22 23:48:10 -07:00
committed by Neil Lathwood
parent 374f6b3ade
commit c32a41a5bf

View File

@@ -1280,8 +1280,6 @@ function guidv4($data)
*/
function set_curl_proxy($curl)
{
global $config;
$proxy = get_proxy();
$tmp = rtrim($proxy, "/");
@@ -1298,6 +1296,8 @@ function set_curl_proxy($curl)
*/
function get_proxy()
{
global $config;
if (getenv('http_proxy')) {
return getenv('http_proxy');
} elseif (getenv('https_proxy')) {