// 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
@@ -368,8 +368,7 @@ class MondialRelay extends Module
 		self::$modulePath =	_PS_MODULE_DIR_. 'mondialrelay/';
 		self::$MRToken = sha1('mr'._COOKIE_KEY_.'mrAgain');
 	
-		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) 
-			&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
+		$protocol = (Configuration::get('PS_SSL_ENABLED') || Tools::usingSecureMode()) ? 'https://' : 'http://';
 		
 		$endURL = __PS_BASE_URI__.'/modules/mondialrelay/';