From 68576b8d4ad577fac76a221ae98d55cff46a75c2 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Thu, 22 Dec 2011 22:52:18 +0000
Subject: [PATCH] // BugFix : notice in module tab

---
 admin-dev/themes/template/modules_positions/list_modules.tpl | 4 +++-
 controllers/admin/AdminModulesPositionsController.php        | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/template/modules_positions/list_modules.tpl b/admin-dev/themes/template/modules_positions/list_modules.tpl
index ff353ac10..6c2eaccd7 100644
--- a/admin-dev/themes/template/modules_positions/list_modules.tpl
+++ b/admin-dev/themes/template/modules_positions/list_modules.tpl
@@ -99,8 +99,9 @@
 	<span style="color:grey;">({l s='Technical name: '}{$hook['name']})</span></th></tr>
 	{if $hook['module_count']}
 		{foreach $hook['modules'] as $position => $module}
+			{if isset($module['instance'])}
 			<tr id="{$hook['id_hook']}_{$module['instance']->id}" {cycle values='class="alt_row",'} style="height: 42px;">
-			<td align=center >				<input type="checkbox" id="mod{$hook['id_hook']}_{$module['instance']->id}" class="hook{$hook['id_hook']}" onclick="hookCheckboxes({$hook['id_hook']}, 1, this)" name="unhooks[]" value="{$hook['id_hook']}_{$module['instance']->id}"/></td>
+			<td align=center ><input type="checkbox" id="mod{$hook['id_hook']}_{$module['instance']->id}" class="hook{$hook['id_hook']}" onclick="hookCheckboxes({$hook['id_hook']}, 1, this)" name="unhooks[]" value="{$hook['id_hook']}_{$module['instance']->id}"/></td>
 			{if !$display_key}
 				<td align=center  class="positions">{$module@iteration}</td>
 				<td {if $can_move && $hook['module_count'] >= 2} align=center class="dragHandle"{/if} id="td_{$hook['id_hook']}_{$module['instance']->id}">
@@ -129,6 +130,7 @@
 					</a>
 				</td>
 			</tr>
+			{/if}
 		{/foreach}
 	{else}
 		<tr><td colspan="5">{l s='No module for this hook'}</td></tr>
diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php
index aaed91d94..7b926a2dd 100644
--- a/controllers/admin/AdminModulesPositionsController.php
+++ b/controllers/admin/AdminModulesPositionsController.php
@@ -255,8 +255,9 @@ class AdminModulesPositionsControllerCore extends AdminController
 			$hooks[$key]['module_count'] = count($hooks[$key]['modules']);
 			// If modules were found, link to the previously created Module instances
 			if (is_array($hooks[$key]['modules']) && !empty($hooks[$key]['modules']))
-				foreach($hooks[$key]['modules'] as $module_key => $module)
-					$hooks[$key]['modules'][$module_key]['instance'] = $module_instances[$assoc_modules_id[$module['id_module']]];
+				foreach($hooks[$key]['modules'] as $module_key => $module) 
+					if (isset($assoc_modules_id[$module['id_module']]))
+						$hooks[$key]['modules'][$module_key]['instance'] = $module_instances[$assoc_modules_id[$module['id_module']]];
 		}
 
 		$this->addJqueryPlugin("tablednd");