Merge branch 'ticket-11985-MondialRelay_part2' into develop

This commit is contained in:
Marion Muszynski 2017-04-07 12:21:56 +02:00
commit 9c9b9cc2ff

View File

@ -782,7 +782,7 @@ class MondialRelay extends Module
$carrier->mr_dlv_mode = $method['dlv_mode'];
}
if (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) && Tools::strtolower($_SERVER['HTTPS']) != 'off'))
if (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) && Tools::strtolower($_SERVER['HTTPS']) != 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PORT'] == '443'))
$ssl = 'true';
else $ssl = 'false';