From c2eaa4af59f23d63d0d9074db3e1e2fcc9c4f686 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Tue, 14 Feb 2012 10:44:08 +0000
Subject: [PATCH] [-] BO : fix Save&Stay not working on combination page

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13298 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../themes/default/template/helpers/list/list_footer.tpl   | 7 ++++---
 .../themes/default/template/helpers/list/list_header.tpl   | 2 ++
 classes/helper/HelperList.php                              | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index 36195e9f3..25cb28f60 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -35,7 +35,8 @@
 		</td>
 	</tr>
 </table>
-<input type="hidden" name="token" value="{$token}" />
-</form>
-
+{if !$simple_header}
+	<input type="hidden" name="token" value="{$token}" />
+	</form>
+{/if}
 {block name="after"}{/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 6f7dbe847..28478a9dc 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -78,8 +78,10 @@
 
 {block name="override_header"}{/block}
 
+{if !$simple_header}
 <form method="post" action="{$action}" class="form">
 	<input type="hidden" id="submitFilter{$table}" name="submitFilter{$table}" value="0"/>
+{/if}
 	<table class="table_grid">
 		{if !$simple_header}
 			<tr>
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index dc839e3a5..26f60ca73 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -638,6 +638,7 @@ class HelperListCore extends Helper
 			'table' => $this->table,
 			'current' => $this->currentIndex,
 			'bulk_actions' => $this->bulk_actions,
+			'simple_header' => $this->simple_header
 		)));
 		return $this->footer_tpl->fetch();
 	}