From e26ffeb7892fbee7262b00c010d3b109dbb611a6 Mon Sep 17 00:00:00 2001 From: mohrt Date: Mon, 3 Dec 2001 20:57:05 +0000 Subject: [PATCH] update constructor to check for SMARTY_DIR before assigning --- Smarty.class.php | 22 ++++++++++++---------- libs/Smarty.class.php | 22 ++++++++++++---------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Smarty.class.php b/Smarty.class.php index 076aeb27..0a02e2ba 100644 --- a/Smarty.class.php +++ b/Smarty.class.php @@ -215,16 +215,18 @@ class Smarty \*======================================================================*/ function Smarty() { - $this->template_dir = SMARTY_DIR.$this->template_dir; - $this->config_dir = SMARTY_DIR.$this->config_dir; - $this->compile_dir = SMARTY_DIR.$this->compile_dir; - $this->cache_dir = SMARTY_DIR.$this->cache_dir; - - for ($x=0; $x < count($this->secure_dir); $x++) { - $this->secure_dir[$x] = SMARTY_DIR.$this->secure_dir[$x]; - } - for ($x=0; $x < count($this->trusted_dir); $x++) { - $this->trusted_dir[$x] = SMARTY_DIR.$this->trusted_dir[$x]; + if(!empty(SMARTY_DIR)) { + $this->template_dir = SMARTY_DIR.$this->template_dir; + $this->config_dir = SMARTY_DIR.$this->config_dir; + $this->compile_dir = SMARTY_DIR.$this->compile_dir; + $this->cache_dir = SMARTY_DIR.$this->cache_dir; + + for ($x=0; $x < count($this->secure_dir); $x++) { + $this->secure_dir[$x] = SMARTY_DIR.$this->secure_dir[$x]; + } + for ($x=0; $x < count($this->trusted_dir); $x++) { + $this->trusted_dir[$x] = SMARTY_DIR.$this->trusted_dir[$x]; + } } foreach ($this->global_assign as $key => $var_name) { diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 076aeb27..0a02e2ba 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -215,16 +215,18 @@ class Smarty \*======================================================================*/ function Smarty() { - $this->template_dir = SMARTY_DIR.$this->template_dir; - $this->config_dir = SMARTY_DIR.$this->config_dir; - $this->compile_dir = SMARTY_DIR.$this->compile_dir; - $this->cache_dir = SMARTY_DIR.$this->cache_dir; - - for ($x=0; $x < count($this->secure_dir); $x++) { - $this->secure_dir[$x] = SMARTY_DIR.$this->secure_dir[$x]; - } - for ($x=0; $x < count($this->trusted_dir); $x++) { - $this->trusted_dir[$x] = SMARTY_DIR.$this->trusted_dir[$x]; + if(!empty(SMARTY_DIR)) { + $this->template_dir = SMARTY_DIR.$this->template_dir; + $this->config_dir = SMARTY_DIR.$this->config_dir; + $this->compile_dir = SMARTY_DIR.$this->compile_dir; + $this->cache_dir = SMARTY_DIR.$this->cache_dir; + + for ($x=0; $x < count($this->secure_dir); $x++) { + $this->secure_dir[$x] = SMARTY_DIR.$this->secure_dir[$x]; + } + for ($x=0; $x < count($this->trusted_dir); $x++) { + $this->trusted_dir[$x] = SMARTY_DIR.$this->trusted_dir[$x]; + } } foreach ($this->global_assign as $key => $var_name) {