Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-06 02:29:07 +02:00
Code Issues Packages Projects Releases Activity

Use new gpm.proxy_url and fallback to old proxy_url setting

Browse Source
This commit is contained in:
Andy Miller
2016-04-12 15:47:52 -06:00
parent 0e40257176
commit 7e06b01771
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Common/GPM/Response.php
View File

@@ -197,7 +197,8 @@ class Response
$callback = $args[2];
// if proxy set add that
$proxy_url = Grav::instance()['config']->get('system.proxy_url');
$config = Grav::instance()['config'];
$proxy_url = $config->get('system.gpm.proxy_url', $config->get('system.proxy_url'));
if ($proxy_url) {
$parsed_url = parse_url($proxy_url);
@@ -273,7 +274,8 @@ class Response
}
// if proxy set add that
$proxy_url = Grav::instance()['config']->get('system.proxy_url');
$config = Grav::instance()['config'];
$proxy_url = $config->get('system.gpm.proxy_url', $config->get('system.proxy_url'));
if ($proxy_url) {
$parsed_url = parse_url($proxy_url);