// small fixes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14651 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 09:47:34 +00:00
parent 41f137e82b
commit 3c2f9de5ba
10 changed files with 44 additions and 13 deletions
@@ -91,7 +91,7 @@ class AdminPreferencesControllerCore extends AdminController
 			);

 			// No HTTPS activation if you haven't already.
-			if (!Tools::usingSecureMode())
+			if (!Tools::usingSecureMode() && !Configuration::get('PS_SSL_ENABLED'))
 			{
 				$fields['PS_SSL_ENABLED']['type'] = 'disabled';
 				$fields['PS_SSL_ENABLED']['disabled'] = '<a href="https://'.Tools::getShopDomainSsl().Tools::safeOutput($_SERVER['REQUEST_URI']).'">'.