Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

js/admin_carrier_wizard.js

@@ -44,7 +44,8 @@ function initCarrierWizard()
 		'onLeaveStep' : onLeaveStepCallback,
 		'onFinish' : onFinishCallback,
 		'transitionEffect' : 'slideleft',
-		'enableAllSteps' : enableAllSteps
+		'enableAllSteps' : enableAllSteps,
+		'keyNavigation' : false
 	});
 	displayRangeType();
 }

modules/blocktopmenu/blocktopmenu.php

@@ -52,7 +52,7 @@ class Blocktopmenu extends Module
 	{
 		$this->name = 'blocktopmenu';
 		$this->tab = 'front_office_features';
-		$this->version = 1.5;
+		$this->version = 1.6;
 		$this->author = 'PrestaShop';
 
 		parent::__construct();
@@ -69,6 +69,7 @@ class Blocktopmenu extends Module
 			!Configuration::updateGlobalValue('MOD_BLOCKTOPMENU_SEARCH', '1') ||
 			!$this->registerHook('actionObjectCategoryUpdateAfter') ||
 			!$this->registerHook('actionObjectCategoryDeleteAfter') ||
+			!$this->registerHook('actionObjectCategoryAddAfter') ||
 			!$this->registerHook('actionObjectCmsUpdateAfter') ||
 			!$this->registerHook('actionObjectCmsDeleteAfter') ||
 			!$this->registerHook('actionObjectSupplierUpdateAfter') ||
@@ -797,7 +798,11 @@ class Blocktopmenu extends Module
 
 		return Db::getInstance()->executeS($sql);
 	}
-	
+
+	public function hookActionObjectCategoryAddAfter($params)
+	{
+		$this->clearMenuCache();
+	}
 
 	public function hookActionObjectCategoryUpdateAfter($params)
 	{

modules/blocktopmenu/config.xml

@@ -2,7 +2,7 @@
         <module>
             <name>blocktopmenu</name>
             <displayName><![CDATA[Top horizontal menu]]></displayName>
-            <version><![CDATA[1.5]]></version>
+            <version><![CDATA[1.6]]></version>
             <description><![CDATA[Add a new horizontal menu to the top of your e-commerce website.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[front_office_features]]></tab>

modules/blocktopmenu/upgrade/install-1.6.php

@@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_1_6($object)
+{
+	return ($object->registerHook('actionObjectCategoryAddAfter'));
+}

themes/live_edit.tpl

@@ -24,11 +24,11 @@
 *}
 <script type="text/javascript">
 	{if isset($smarty.get.ad) && isset($smarty.get.live_edit)}
-		var ad = "{$smarty.get.ad}";
+		var ad = '{$smarty.get.ad}';
 	{/if}
 	var lastMove = '';
 	var saveOK = '{l s='Module position saved' js=1}';
-	var confirmClose = "{l s='Are you sure? If you close this window, its position won't be saved'  js=1}";
+	var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved'  js=1}';
 	var close = '{l s='Close' js=1}';
 	var cancel = '{l s='Cancel' js=1}';
 	var confirm = '{l s='Confirm' js=1}';