From c32a41a5bff97500c70bcf06cf00ba44942dd2cc Mon Sep 17 00:00:00 2001 From: pblasquez Date: Wed, 22 Mar 2017 23:48:10 -0700 Subject: [PATCH] Load config for new get_proxy function (#6247) --- includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/functions.php b/includes/functions.php index 36128e051f..8b0da145b3 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -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')) {