From fe5fe7f3db8462fa23e3f761cb716fd3a9bd628c Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Thu, 17 Nov 2011 09:03:42 +0000
Subject: [PATCH] // fix ajax-tab

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10195 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/layout-ajax.tpl |  2 +-
 classes/AdminController.php               | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/template/layout-ajax.tpl b/admin-dev/themes/template/layout-ajax.tpl
index 2834add9b..5a3fc8dc2 100644
--- a/admin-dev/themes/template/layout-ajax.tpl
+++ b/admin-dev/themes/template/layout-ajax.tpl
@@ -85,4 +85,4 @@
 	</div>
 {/if}
 
-{$content}
+{$page}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index badab17da..a5ed1a3fc 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -998,12 +998,16 @@ class AdminControllerCore extends Controller
 			$this->context->smarty->assign('content', $this->context->smarty->fetch($tpl_action));
 		}
 
-		// Check if content template has been override
-		if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl))
-			$page = $this->context->smarty->fetch($tpl);
+		if (!$this->ajax)
+		{
+			// Check if content template has been override
+			if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl))
+				$page = $this->context->smarty->fetch($tpl);
+			else
+				$page = $this->context->smarty->fetch($this->template);
+		}
 		else
-			$page = $this->context->smarty->fetch($this->template);
-
+			$page = $this->content;
 
 		if ($conf = Tools::getValue('conf'))
 			$this->context->smarty->assign('conf', $this->_conf[(int)$conf]);