From f269d0b0a2b426f52f4262f196ab64dab9bfd796 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 29 Dec 2011 13:38:22 +0000
Subject: [PATCH] // Fix id_lang in Link class

---
 classes/Link.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/classes/Link.php b/classes/Link.php
index 6dc70fe07..737d6911e 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -134,9 +134,9 @@ class LinkCore
 	 */
 	public function getCategoryLink($category, $alias = null, $id_lang = null)
 	{
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
+		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		if (!is_object($category))
 			$category = new Category($category, $id_lang);
@@ -161,9 +161,9 @@ class LinkCore
 	 */
 	public function getCMSCategoryLink($category, $alias = null, $id_lang = null)
 	{
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
+		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		if (!is_object($category))
 			$category = new CMSCategory($category, $id_lang);
@@ -190,9 +190,10 @@ class LinkCore
 	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));
-		$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
+
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
+		$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		if (!is_object($cms))
 			$cms = new CMS($cms, $id_lang);
@@ -217,9 +218,9 @@ class LinkCore
 	 */
 	public function getSupplierLink($supplier, $alias = null, $id_lang = null)
 	{
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
+		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		if (!is_object($supplier))
 			$supplier = new Supplier($supplier, $id_lang);
@@ -244,9 +245,9 @@ class LinkCore
 	 */
 	public function getManufacturerLink($manufacturer, $alias = null, $id_lang = null)
 	{
-		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 		if (!$id_lang)
 			$id_lang = Context::getContext()->language->id;
+		$url = _PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		if (!is_object($manufacturer))
 			$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
 	 * @param string $module Module name
@@ -273,9 +274,10 @@ class LinkCore
 	public function getModuleLink($module, $process, $ssl = false, $id_lang = null)
 	{
 		$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)
 			$id_lang = Context::getContext()->language->id;
+		$url = $base.__PS_BASE_URI__.$this->getLangLink($id_lang);
 
 		// Set available keywords
 		$params = array();