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

// small fix

Browse Source
This commit is contained in:
Rémi Gaillard
2013-01-09 10:28:28 +01:00
parent 857b8c2009
commit 2dac490089
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Link.php
View File

@@ -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;

2
controllers/front/ParentOrderController.php
View File

@@ -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