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

modules/blockcms/blockcms.php

@@ -39,7 +39,7 @@ class BlockCms extends Module
 	{
 		$this->name = 'blockcms';
 		$this->tab = 'front_office_features';
-		$this->version = '1.3';
+		$this->version = '1.4';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
@@ -61,6 +61,7 @@ class BlockCms extends Module
 			|| !$this->registerHook('actionObjectCmsUpdateAfter')
 			|| !$this->registerHook('actionObjectCmsDeleteAfter')
 			|| !$this->registerHook('actionShopDataDuplication')
+			|| !$this->registerHook('actionAdminStoresControllerUpdate_optionsAfter')
 			|| !BlockCMSModel::createTables()
 			|| !Configuration::updateValue('FOOTER_CMS', '')
 			|| !Configuration::updateValue('FOOTER_BLOCK_ACTIVATION', 1)
@@ -684,6 +685,12 @@ class BlockCms extends Module
 		return parent::getCacheId('blockcms|'.$name);
 	}
 
+	public function hookActionAdminStoresControllerUpdate_optionsAfter()
+	{
+		if (Tools::getIsset('PS_STORES_DISPLAY_FOOTER'))
+			$this->_clearCache('blockcms.tpl');
+	}
+
 	public function hookActionObjectCmsUpdateAfter()
 	{
 		$this->_clearCache('blockcms.tpl');

modules/blockcms/config.xml

@@ -2,7 +2,7 @@
         <module>
             <name>blockcms</name>
             <displayName><![CDATA[CMS Block]]></displayName>
-            <version><![CDATA[1.3]]></version>
+            <version><![CDATA[1.4]]></version>
             <description><![CDATA[Adds a block with several CMS links.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[front_office_features]]></tab>

modules/blockcms/upgrade/install-1.4.php

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