tiamak/advancedmegamenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Thibaud Chauviere
2014-05-12 11:26:54 +02:00
parent 9440b0199e cc41b07ca0
commit 51afc886b6
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.txt
+4
View File
@@ -0,0 +1,4 @@
2014-04-22 18:57:57 +0200 // Changelog updated
2014-03-24 11:43:29 +0100 / MO blocktopmenu : ps_versions_compliancy modified (1.5.6.1 => 1.6)
2014-03-24 11:04:46 +0100 / MO blocktopmenu : ps_versions_compliancy added
2014-03-20 14:28:17 +0100 Initial commit
blocktopmenu.php
+3 -2
View File
@@ -52,7 +52,7 @@ class Blocktopmenu extends Module
{ {
$this->name = 'blocktopmenu'; $this->name = 'blocktopmenu';
$this->tab = 'front_office_features'; $this->tab = 'front_office_features';
$this->version = 1.11; $this->version = '1.12';
$this->author = 'PrestaShop'; $this->author = 'PrestaShop';
$this->bootstrap = true; $this->bootstrap = true;
@@ -583,7 +583,8 @@ class Blocktopmenu extends Module
$this->page_name = Dispatcher::getInstance()->getController(); $this->page_name = Dispatcher::getInstance()->getController();
if (!$this->isCached('blocktopmenu.tpl', $this->getCacheId())) if (!$this->isCached('blocktopmenu.tpl', $this->getCacheId()))
{ {
$this->makeMenu(); if (Tools::isEmpty($this->_menu))
$this->makeMenu();
$this->smarty->assign('MENU_SEARCH', Configuration::get('MOD_BLOCKTOPMENU_SEARCH')); $this->smarty->assign('MENU_SEARCH', Configuration::get('MOD_BLOCKTOPMENU_SEARCH'));
$this->smarty->assign('MENU', $this->_menu); $this->smarty->assign('MENU', $this->_menu);
$this->smarty->assign('this_path', $this->_path); $this->smarty->assign('this_path', $this->_path);
config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module> <module>
<name>blocktopmenu</name> <name>blocktopmenu</name>
<displayName><![CDATA[Top horizontal menu]]></displayName> <displayName><![CDATA[Top horizontal menu]]></displayName>
<version><![CDATA[1.11]]></version> <version><![CDATA[1.12]]></version>
<description><![CDATA[Adds a new horizontal menu to the top of your e-commerce website.]]></description> <description><![CDATA[Adds a new horizontal menu to the top of your e-commerce website.]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab> <tab><![CDATA[front_office_features]]></tab>