Merge branch 'dev'
This commit is contained in:
@@ -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
|
||||
+2
-1
@@ -52,7 +52,7 @@ class Blocktopmenu extends Module
|
||||
{
|
||||
$this->name = 'blocktopmenu';
|
||||
$this->tab = 'front_office_features';
|
||||
$this->version = 1.11;
|
||||
$this->version = '1.12';
|
||||
$this->author = 'PrestaShop';
|
||||
|
||||
$this->bootstrap = true;
|
||||
@@ -583,6 +583,7 @@ class Blocktopmenu extends Module
|
||||
$this->page_name = Dispatcher::getInstance()->getController();
|
||||
if (!$this->isCached('blocktopmenu.tpl', $this->getCacheId()))
|
||||
{
|
||||
if (Tools::isEmpty($this->_menu))
|
||||
$this->makeMenu();
|
||||
$this->smarty->assign('MENU_SEARCH', Configuration::get('MOD_BLOCKTOPMENU_SEARCH'));
|
||||
$this->smarty->assign('MENU', $this->_menu);
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
<module>
|
||||
<name>blocktopmenu</name>
|
||||
<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>
|
||||
<author><![CDATA[PrestaShop]]></author>
|
||||
<tab><![CDATA[front_office_features]]></tab>
|
||||
|
||||
Reference in New Issue
Block a user