// Merge -> revision 8097

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 16:10:20 +00:00
parent 89bc665d48
commit 0aada6cc1e
41 changed files with 107 additions and 135 deletions
@@ -224,6 +224,10 @@ class ToolsCore
 	*/
 	public static function usingSecureMode()
 	{
+		if (empty($_SERVER['HTTPS'])) {
+			if(!empty($_SERVER['SSL']))
+				$_SERVER['HTTPS'] = $_SERVER['SSL'];
+		}
 		return !(empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off');
 	}