dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix #PSFV-310

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12062 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-03 13:54:09 +00:00
parent 4017f3f60b
commit 204f331ae2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+1 -2
View File
@@ -140,8 +140,7 @@ class ToolsCore
*/ */
public static function getShopProtocol() public static function getShopProtocol()
{ {
$id_shop = Context::getContext()->shop()->id; $protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS'])
$protocol = (Configuration::get('PS_SSL_ENABLED', null, null, $id_shop) || (!empty($_SERVER['HTTPS'])
&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://'; && strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
return $protocol; return $protocol;
} }