From 204f331ae2affbc9f118c82c99e80c74686f115b Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 3 Jan 2012 13:54:09 +0000
Subject: [PATCH] // Fix #PSFV-310

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12062 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Tools.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index 2f3c275d2..a4f8752b3 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -140,8 +140,7 @@ class ToolsCore
 	 */
 	public static function getShopProtocol()
 	{
-		$id_shop = Context::getContext()->shop()->id;
-		$protocol = (Configuration::get('PS_SSL_ENABLED', null, null, $id_shop) || (!empty($_SERVER['HTTPS'])
+		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS'])
 			&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
 		return $protocol;
 	}