From 04760c91e5afb8114085cd313e17c4fbdc698f5b Mon Sep 17 00:00:00 2001 From: ccauw Date: Mon, 25 Nov 2013 14:13:10 +0100 Subject: [PATCH] [-] BO : Double separator in function createTemplate() smarty->getTemplateDir() returns a result ending with a separator, so no need to add DIRECTORY_SEPARATOR ? --- classes/helper/Helper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php index 475607385..eec8d18a9 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.php @@ -86,9 +86,9 @@ class HelperCore $override_tpl_path = _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/_configure/'.$this->override_folder.$this->base_folder.$tpl_name; else { - if (file_exists($this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name)) - $override_tpl_path = $this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name; - else if (file_exists($this->context->smarty->getTemplateDir(0).DIRECTORY_SEPARATOR.'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name)) + if (file_exists($this->context->smarty->getTemplateDir(1).$this->override_folder.$this->base_folder.$tpl_name)) + $override_tpl_path = $this->context->smarty->getTemplateDir(1).$this->override_folder.$this->base_folder.$tpl_name; + else if (file_exists($this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name)) $override_tpl_path = $this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name; }