From 99d00cb4c2d5c3d60721b3688e7791b23ef578d8 Mon Sep 17 00:00:00 2001
From: Francois Gaillard <francois.gaillard@prestashop.com>
Date: Tue, 22 Apr 2014 18:57:57 +0200
Subject: [PATCH 1/4] // Changelog updated

---
 CHANGELOG.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 CHANGELOG.txt

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 0000000..948db9e
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1,3 @@
+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

From 1bbf09460f611b86d2b91188c02a52302977a445 Mon Sep 17 00:00:00 2001
From: Francois Gaillard <francois.gaillard@prestashop.com>
Date: Tue, 22 Apr 2014 19:06:33 +0200
Subject: [PATCH 2/4] // Changelog updated

---
 CHANGELOG.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 948db9e..58b6dc3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +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

From 5c2619f3cc1d045fb693105d604fb03311805d33 Mon Sep 17 00:00:00 2001
From: Thibaud Chauviere <thibaud.chauviere@gmail.com>
Date: Mon, 12 May 2014 11:21:16 +0200
Subject: [PATCH 3/4] [-] MO : blocktopmenu - Correct multiple hookTop menu
 links duplicates #PSCSX-2057

---
 blocktopmenu.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/blocktopmenu.php b/blocktopmenu.php
index 7513581..8bd63d6 100644
--- a/blocktopmenu.php
+++ b/blocktopmenu.php
@@ -583,7 +583,8 @@ class Blocktopmenu extends Module
 		$this->page_name = Dispatcher::getInstance()->getController();
 		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', $this->_menu);
 			$this->smarty->assign('this_path', $this->_path);

From cc41b07ca029b6a89e1119452e7c79d27f1fd117 Mon Sep 17 00:00:00 2001
From: Thibaud Chauviere <thibaud.chauviere@gmail.com>
Date: Mon, 12 May 2014 11:26:28 +0200
Subject: [PATCH 4/4] // Version changed

---
 blocktopmenu.php | 2 +-
 config.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blocktopmenu.php b/blocktopmenu.php
index 8bd63d6..1947184 100644
--- a/blocktopmenu.php
+++ b/blocktopmenu.php
@@ -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;
diff --git a/config.xml b/config.xml
index 7d0222b..d89c6e0 100644
--- a/config.xml
+++ b/config.xml
@@ -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>