From 6ecd23a743d27fa731bb6cc93373320d09752bfb Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 8 Jan 2013 11:45:41 +0100
Subject: [PATCH] [-] FO : fix PSCFV-5934 bad redirection from https to http
 for CMS

---
 classes/Link.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/Link.php b/classes/Link.php
index 43c3d574e..4f856b350 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -199,6 +199,7 @@ class LinkCore
 	{
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
+						
 		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		if (!is_object($category))
@@ -225,7 +226,7 @@ class LinkCore
 	 */
 	public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = null)
 	{
-		$base = (($ssl && $this->ssl_enable) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
+		$base = (($ssl || $this->ssl_enable) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
 
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;