Merge pull request #36 from sfroment42/dev

Follow up of #30 #33
This commit is contained in:
Jérôme Nadaud
2015-08-04 14:40:00 +02:00
+2 -2
View File
@@ -685,7 +685,7 @@ class Blocktopmenu extends Module
$id_lang = $id_lang ? (int)$id_lang : (int)Context::getContext()->language->id; $id_lang = $id_lang ? (int)$id_lang : (int)Context::getContext()->language->id;
$id_shop = ($id_shop !== false) ? $id_shop : Context::getContext()->shop->id; $id_shop = ($id_shop !== false) ? $id_shop : Context::getContext()->shop->id;
$categories = $this->getCMSCategories(false, (int)$parent, (int)$id_lang, (int)$id_shop); $categories = $this->getCMSCategories(false, (int)$parent, (int)$id_lang, (int)$id_shop);
$pages = $this->getCMSPages((int)$parent, false, (int)$id_lang, (int)$id_shop); $pages = $this->getCMSPages((int)$parent, (int)$id_shop, (int)$id_lang);
$spacer = str_repeat(' ', $this->spacer_size * (int)$depth); $spacer = str_repeat(' ', $this->spacer_size * (int)$depth);
@@ -794,7 +794,7 @@ class Blocktopmenu extends Module
} }
} }
protected function getCMSPages($id_cms_category, $id_shop = false, $id_lang = false, $id_shop = false) protected function getCMSPages($id_cms_category, $id_shop = false, $id_lang = false)
{ {
$id_shop = ($id_shop !== false) ? (int)$id_shop : (int)Context::getContext()->shop->id; $id_shop = ($id_shop !== false) ? (int)$id_shop : (int)Context::getContext()->shop->id;
$id_lang = $id_lang ? (int)$id_lang : (int)Context::getContext()->language->id; $id_lang = $id_lang ? (int)$id_lang : (int)Context::getContext()->language->id;