From 4b858a2bedd4f14396aff9dfc3eaeb17b2276285 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 16 Nov 2011 13:35:44 +0000
Subject: [PATCH] // fix bug view.tpl in AdminSuppliersController

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10172 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/suppliers/view.tpl   | 9 +++++++--
 controllers/admin/AdminSuppliersController.php | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/template/suppliers/view.tpl b/admin-dev/themes/template/suppliers/view.tpl
index 0d4c5a5fe..908d5c57c 100644
--- a/admin-dev/themes/template/suppliers/view.tpl
+++ b/admin-dev/themes/template/suppliers/view.tpl
@@ -24,6 +24,10 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
+{extends file="helper/view/view.tpl"}
+
+{block name="override_tpl"}
+
 <h2>{$supplier->name}</h2>
 
 <h3>{l s='Total products:'} {count($products)}</h3>
@@ -61,5 +65,6 @@
 		</table>
 	{/if}
 {/foreach}
-<br /><br />
-<a href="{$current}&token={$token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to manufacturer list'}</a><br />
+
+{/block}
+
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index 37397370e..82842ff49 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -190,11 +190,13 @@ class AdminSuppliersControllerCore extends AdminController
 			}
 		}
 
-		$this->context->smarty->assign(array(
+		$this->tpl_view_vars = array(
 			'supplier' => $this->object,
 			'products' => $products,
 			'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'),
-		));
+		);
+
+		return parent::initView();
 	}
 
 	public function afterImageUpload()