From 52f76312f000dc1175f48b22fc1dc73b26dc36cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dr=C3=BFSs?= Date: Mon, 18 Mar 2013 17:05:22 +0100 Subject: [PATCH 1/2] [-] FO: CMS link to conditions should not be in SSL --- controllers/front/OrderOpcController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 53e379b6d..215367b8d 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -483,7 +483,7 @@ class OrderOpcControllerCore extends ParentOrderController $address_delivery = new Address($this->context->cart->id_address_delivery); $cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id); - $link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite, true); + $link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite); if (!strpos($link_conditions, '?')) $link_conditions .= '?content_only=1'; else From b4b90669d087c8f1d1a0363b4a719a6244cc7704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dr=C3=BFSs?= Date: Mon, 18 Mar 2013 17:07:41 +0100 Subject: [PATCH 2/2] [-] FO: CMS link to conditions should not be in SSL --- controllers/front/ParentOrderController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 164ba87b2..97663a574 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -492,7 +492,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, false); + $this->link_conditions = $this->context->link->getCMSLink($cms, $cms->link_rewrite); if (!strpos($this->link_conditions, '?')) $this->link_conditions .= '?content_only=1'; else