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

// Fix id_lang in Link class

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11887 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2011-12-29 13:38:22 +00:00
1 parent 0500d8282a
commit be301f3270
1 file changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files
classes/Link.php
+9 -7
View File
@@ -134,9 +134,9 @@ class LinkCore
*/ */
public function getCategoryLink($category, $alias = null, $id_lang = null) public function getCategoryLink($category, $alias = null, $id_lang = null)
{ {
$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
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);
if (!is_object($category)) if (!is_object($category))
$category = new Category($category, $id_lang); $category = new Category($category, $id_lang);
@@ -161,9 +161,9 @@ class LinkCore
*/ */
public function getCMSCategoryLink($category, $alias = null, $id_lang = null) public function getCMSCategoryLink($category, $alias = null, $id_lang = null)
{ {
$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
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);
if (!is_object($category)) if (!is_object($category))
$category = new CMSCategory($category, $id_lang); $category = new CMSCategory($category, $id_lang);
@@ -190,9 +190,10 @@ 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 AND Configuration::get('PS_SSL_ENABLED')) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true)); $base = (($ssl AND Configuration::get('PS_SSL_ENABLED')) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true));
$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
if (!$id_lang) if (!$id_lang)
$id_lang = Context::getContext()->language->id; $id_lang = Context::getContext()->language->id;
$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
if (!is_object($cms)) if (!is_object($cms))
$cms = new CMS($cms, $id_lang); $cms = new CMS($cms, $id_lang);
@@ -217,9 +218,9 @@ class LinkCore
*/ */
public function getSupplierLink($supplier, $alias = null, $id_lang = null) public function getSupplierLink($supplier, $alias = null, $id_lang = null)
{ {
$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
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);
if (!is_object($supplier)) if (!is_object($supplier))
$supplier = new Supplier($supplier, $id_lang); $supplier = new Supplier($supplier, $id_lang);
@@ -244,9 +245,9 @@ class LinkCore
*/ */
public function getManufacturerLink($manufacturer, $alias = null, $id_lang = null) public function getManufacturerLink($manufacturer, $alias = null, $id_lang = null)
{ {
$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
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);
if (!is_object($manufacturer)) if (!is_object($manufacturer))
$manufacturer = new Manufacturer($manufacturer, $id_lang); $manufacturer = new Manufacturer($manufacturer, $id_lang);
@@ -262,7 +263,7 @@ class LinkCore
} }
/** /**
* Create a link to a supplier * Create a link to a module
* *
* @since 1.5.0 * @since 1.5.0
* @param string $module Module name * @param string $module Module name
@@ -273,9 +274,10 @@ class LinkCore
public function getModuleLink($module, $process, $ssl = false, $id_lang = null) public function getModuleLink($module, $process, $ssl = false, $id_lang = null)
{ {
$base = (($ssl && Configuration::get('PS_SSL_ENABLED')) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_); $base = (($ssl && Configuration::get('PS_SSL_ENABLED')) ? _PS_BASE_URL_SSL_ : _PS_BASE_URL_);
$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
if (!$id_lang) if (!$id_lang)
$id_lang = Context::getContext()->language->id; $id_lang = Context::getContext()->language->id;
$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
// Set available keywords // Set available keywords
$params = array(); $params = array();