From c0bc3bda29902b963fe2946a1cbd20b7b712a172 Mon Sep 17 00:00:00 2001 From: Francois Gaillard Date: Tue, 6 Aug 2013 11:13:49 +0200 Subject: [PATCH] // Bug fix template override & admin templates --- classes/controller/ModuleAdminController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/controller/ModuleAdminController.php b/classes/controller/ModuleAdminController.php index 60cef6dd0..45375251b 100644 --- a/classes/controller/ModuleAdminController.php +++ b/classes/controller/ModuleAdminController.php @@ -51,9 +51,10 @@ abstract class ModuleAdminControllerCore extends AdminController public function createTemplate($tpl_name) { - if (file_exists($this->getTemplatePath().$this->override_folder.$tpl_name) && $this->viewAccess()) + if (file_exists(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/admin/'.$tpl_name) && $this->viewAccess()) + return $this->context->smarty->createTemplate(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/admin/'.$tpl_name, $this->context->smarty); + elseif (file_exists($this->getTemplatePath().$this->override_folder.$tpl_name) && $this->viewAccess()) return $this->context->smarty->createTemplate($this->getTemplatePath().$this->override_folder.$tpl_name, $this->context->smarty); - return parent::createTemplate($tpl_name); } @@ -64,8 +65,6 @@ abstract class ModuleAdminControllerCore extends AdminController */ public function getTemplatePath() { - if (file_exists(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/admin/'.$template)) - return _PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/admin/'.$template; return _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/'; } }