From 2dac4900892fcf1e5808cdc5656e75a18014fa0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 9 Jan 2013 10:28:28 +0100 Subject: [PATCH] // small fix --- classes/Link.php | 2 +- controllers/front/ParentOrderController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Link.php b/classes/Link.php index 4f856b350..80863ee16 100644 --- a/classes/Link.php +++ b/classes/Link.php @@ -226,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; diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 2fffbdd51..78a846db9 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -485,7 +485,7 @@ class ParentOrderControllerCore extends FrontController // TOS $cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id); - $this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, true); + $this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, false); if (!strpos($this->link_conditions, '?')) $this->link_conditions .= '?content_only=1'; else