From 6cf4fe9a333a38388020113a19dff6b3a59809c6 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 22 Mar 2001 18:21:23 +0000 Subject: [PATCH] Fixed inclusion of dynamic files. --- Smarty_Compiler.class.php | 8 ++++++-- libs/Smarty_Compiler.class.php | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php index 2dfc49c6..c8845e4d 100644 --- a/Smarty_Compiler.class.php +++ b/Smarty_Compiler.class.php @@ -434,7 +434,11 @@ class Smarty_Compiler extends Smarty { $attrs['file'] = $this->_dequote($attrs['file']); $include_func_name = uniqid("_include_"); - $include_file_name = $this->compile_dir.'/'.$attrs['file']; + if ($attrs['file']{0} == '$') + $include_file_name = '"'.$this->compile_dir.'/".'.$attrs['file']; + else + $include_file_name = '"'.$this->compile_dir.'/'.$attrs['file'].'"'; + foreach ($attrs as $arg_name => $arg_value) { if ($arg_name == 'file') continue; @@ -452,7 +456,7 @@ class Smarty_Compiler extends Smarty { " include \"\$file_name.php\";\n" . " }\n" . "}\n" . - "$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>"; + "$include_func_name($include_file_name, get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>"; } /*======================================================================*\ diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index 2dfc49c6..c8845e4d 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -434,7 +434,11 @@ class Smarty_Compiler extends Smarty { $attrs['file'] = $this->_dequote($attrs['file']); $include_func_name = uniqid("_include_"); - $include_file_name = $this->compile_dir.'/'.$attrs['file']; + if ($attrs['file']{0} == '$') + $include_file_name = '"'.$this->compile_dir.'/".'.$attrs['file']; + else + $include_file_name = '"'.$this->compile_dir.'/'.$attrs['file'].'"'; + foreach ($attrs as $arg_name => $arg_value) { if ($arg_name == 'file') continue; @@ -452,7 +456,7 @@ class Smarty_Compiler extends Smarty { " include \"\$file_name.php\";\n" . " }\n" . "}\n" . - "$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>"; + "$include_func_name($include_file_name, get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>"; } /*======================================================================*\