From b00ad8249dafcdc3d1ff558a9c119f5b215a6453 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Fri, 23 Sep 2011 15:05:48 +0000 Subject: [PATCH] // git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8743 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/AdminController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/AdminController.php b/classes/AdminController.php index 437a9e008..a3c561f61 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -135,8 +135,8 @@ class AdminControllerCore extends Controller public function display() { if(!empty($this->content)) - $this->assign('content', $this->content); - if (empty($this->template) or $this->template == 'content.tpl') + $this->context->smarty->assign('content', $this->content); + if (empty($this->template)) { $default_tpl = substr(lcfirst(get_class($this)),0,-10).'.tpl'; if (file_exists($this->context->smarty->template_dir.'/'.$default_tpl)) @@ -144,7 +144,7 @@ class AdminControllerCore extends Controller $this->template = $default_tpl; } else - return $this->displayNoSmarty(); + $this->template = 'content.tpl'; } else $this->content = $this->context->smarty->fetch($this->template);