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

[-] FO : fix PSCFV-5934 bad redirection from https to http for CMS

Browse Source
This commit is contained in:
gRoussac committed 2013-01-08 11:45:41 +01:00
1 parent 609abe4656
commit 6ecd23a743
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
classes/Link.php
+2 -1
View File
@@ -199,6 +199,7 @@ class LinkCore
{ {
if (!$id_lang) if (!$id_lang)
$id_lang = Context::getContext()->language->id; $id_lang = Context::getContext()->language->id;
$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang); $url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
if (!is_object($category)) if (!is_object($category))
@@ -225,7 +226,7 @@ class LinkCore
*/ */
public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = null) 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) if (!$id_lang)
$id_lang = Context::getContext()->language->id; $id_lang = Context::getContext()->language->id;