dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #330 from DrySs/patch-5

Browse Source 
[-] FO: CMS link to conditions should not be in SSL
This commit is contained in:
Vincent Augagneur
2013-04-29 01:22:21 -07:00
parent 71b8e7cc33 b4b90669d0
commit fe05e1cc39
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderOpcController.php
+1 -1
View File
@@ -493,7 +493,7 @@ class OrderOpcControllerCore extends ParentOrderController
$address_delivery = new Address($this->context->cart->id_address_delivery); $address_delivery = new Address($this->context->cart->id_address_delivery);
$cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id); $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, '?')) if (!strpos($link_conditions, '?'))
$link_conditions .= '?content_only=1'; $link_conditions .= '?content_only=1';
else else
controllers/front/ParentOrderController.php
+1 -1
View File
@@ -494,7 +494,7 @@ class ParentOrderControllerCore extends FrontController
// TOS // TOS
$cms = new CMS(Configuration::get('PS_CONDITIONS_CMS_ID'), $this->context->language->id); $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, '?')) if (!strpos($this->link_conditions, '?'))
$this->link_conditions .= '?content_only=1'; $this->link_conditions .= '?content_only=1';
else else