Skip to content

Commit

Permalink
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into fix/advan…
Browse files Browse the repository at this point in the history
…cedEuCompliance_update
  • Loading branch information
tchauviere committed Jul 6, 2015
2 parents 30b5d26 + 682ac2f commit 71b417c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion classes/Link.php
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ public function getLanguageLink($id_lang, Context $context = null)
elseif ($controller == 'manufacturer' && isset($params['id_manufacturer']))
return $this->getManufacturerLink((int)$params['id_manufacturer'], null, (int)$id_lang);
elseif ($controller == 'cms' && isset($params['id_cms']))
return $this->getCMSLink((int)$params['id_cms'], null, false, (int)$id_lang);
return $this->getCMSLink((int)$params['id_cms'], null, null, (int)$id_lang);
elseif ($controller == 'cms' && isset($params['id_cms_category']))
return $this->getCMSCategoryLink((int)$params['id_cms_category'], null, (int)$id_lang);
elseif (isset($params['fc']) && $params['fc'] == 'module')
Expand Down

0 comments on commit 71b417c

Please sign in to comment.