smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-07 11:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the config_load scoping.

Browse Source
This commit is contained in:
andrey
2001-03-16 23:02:43 +00:00
parent d32898fb08
commit 2e28c7de45
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Smarty_Compiler.class.php
View File

@@ -396,15 +396,24 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error("missing 'file' attribute in config_load tag"); $this->_syntax_error("missing 'file' attribute in config_load tag");
} }
if (!empty($attrs['global']) && $attrs['global'])
$update_parent = 'true';
else
$update_parent = 'false';
$output = "<?php if (!class_exists('Config_File'))\n" . $output = "<?php if (!class_exists('Config_File'))\n" .
" include_once 'Config_File.class.php';\n" . " include_once 'Config_File.class.php';\n" .
"if (!is_object(\$GLOBALS['_smarty_conf_obj']) || get_class(\$GLOBALS['_smarty_conf_obj']) != 'config_file') {\n" . "if (!is_object(\$GLOBALS['_smarty_conf_obj']) || get_class(\$GLOBALS['_smarty_conf_obj']) != 'config_file')\n" .
" \$GLOBALS['_smarty_conf_obj'] = new Config_File('".$this->config_dir."');\n" . " \$GLOBALS['_smarty_conf_obj'] = new Config_File('".$this->config_dir."');\n" .
"}\n" . "if (isset(\$parent_smarty_config) && $update_parent)\n" .
"\$GLOBALS['_smarty_config'] = array_merge((array)\$GLOBALS['_smarty_config'], \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file']."));\n"; " \$parent_smarty_config = array_merge((array)\$parent_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file']."));\n" .
"\$_smarty_config = array_merge((array)\$_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file']."));\n";
if (!empty($attrs['section'])) if (!empty($attrs['section'])) {
$output .= '$GLOBALS[\'_smarty_config\'] = array_merge((array)$GLOBALS[\'_smarty_config\'], $GLOBALS[\'_smarty_conf_obj\']->get('.$attrs['file'].', '.$attrs['section'].')); '; $output .= "if (isset(\$parent_smarty_config) && $update_parent)\n" .
" \$parent_smarty_config = array_merge((array)\$parent_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file'].", ".$attrs['section']."));\n" .
"\$_smarty_config = array_merge((array)\$_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file'].", ".$attrs['section']."));\n";
}
$output .= '?>'; $output .= '?>';
@@ -436,14 +445,14 @@ class Smarty_Compiler extends Smarty {
return "<?php " . return "<?php " .
"if (!function_exists('$include_func_name')) {\n". "if (!function_exists('$include_func_name')) {\n".
" function $include_func_name(\$file_name, \$def_vars, \$include_vars)\n" . " function $include_func_name(\$file_name, \$def_vars, \$include_vars, &\$parent_smarty_config)\n" .
" {\n" . " {\n" .
" extract(\$def_vars);\n" . " extract(\$def_vars);\n" .
" extract(\$include_vars);\n" . " extract(\$include_vars);\n" .
" include \"\$file_name.php\";\n" . " include \"\$file_name.php\";\n" .
" }\n" . " }\n" .
"}\n" . "}\n" .
"$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."));\n?>"; "$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
} }
/*======================================================================*\ /*======================================================================*\
@@ -841,7 +850,7 @@ class Smarty_Compiler extends Smarty {
$var_name = substr($var_ref, 1, -1); $var_name = substr($var_ref, 1, -1);
$output = "\$GLOBALS['_smarty_config']['$var_name']"; $output = "\$_smarty_config['$var_name']";
$this->_parse_modifiers($output, $modifiers); $this->_parse_modifiers($output, $modifiers);

25
libs/Smarty_Compiler.class.php
View File

@@ -396,15 +396,24 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error("missing 'file' attribute in config_load tag"); $this->_syntax_error("missing 'file' attribute in config_load tag");
} }
if (!empty($attrs['global']) && $attrs['global'])
$update_parent = 'true';
else
$update_parent = 'false';
$output = "<?php if (!class_exists('Config_File'))\n" . $output = "<?php if (!class_exists('Config_File'))\n" .
" include_once 'Config_File.class.php';\n" . " include_once 'Config_File.class.php';\n" .
"if (!is_object(\$GLOBALS['_smarty_conf_obj']) || get_class(\$GLOBALS['_smarty_conf_obj']) != 'config_file') {\n" . "if (!is_object(\$GLOBALS['_smarty_conf_obj']) || get_class(\$GLOBALS['_smarty_conf_obj']) != 'config_file')\n" .
" \$GLOBALS['_smarty_conf_obj'] = new Config_File('".$this->config_dir."');\n" . " \$GLOBALS['_smarty_conf_obj'] = new Config_File('".$this->config_dir."');\n" .
"}\n" . "if (isset(\$parent_smarty_config) && $update_parent)\n" .
"\$GLOBALS['_smarty_config'] = array_merge((array)\$GLOBALS['_smarty_config'], \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file']."));\n"; " \$parent_smarty_config = array_merge((array)\$parent_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file']."));\n" .
"\$_smarty_config = array_merge((array)\$_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file']."));\n";
if (!empty($attrs['section'])) if (!empty($attrs['section'])) {
$output .= '$GLOBALS[\'_smarty_config\'] = array_merge((array)$GLOBALS[\'_smarty_config\'], $GLOBALS[\'_smarty_conf_obj\']->get('.$attrs['file'].', '.$attrs['section'].')); '; $output .= "if (isset(\$parent_smarty_config) && $update_parent)\n" .
" \$parent_smarty_config = array_merge((array)\$parent_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file'].", ".$attrs['section']."));\n" .
"\$_smarty_config = array_merge((array)\$_smarty_config, \$GLOBALS['_smarty_conf_obj']->get(".$attrs['file'].", ".$attrs['section']."));\n";
}
$output .= '?>'; $output .= '?>';
@@ -436,14 +445,14 @@ class Smarty_Compiler extends Smarty {
return "<?php " . return "<?php " .
"if (!function_exists('$include_func_name')) {\n". "if (!function_exists('$include_func_name')) {\n".
" function $include_func_name(\$file_name, \$def_vars, \$include_vars)\n" . " function $include_func_name(\$file_name, \$def_vars, \$include_vars, &\$parent_smarty_config)\n" .
" {\n" . " {\n" .
" extract(\$def_vars);\n" . " extract(\$def_vars);\n" .
" extract(\$include_vars);\n" . " extract(\$include_vars);\n" .
" include \"\$file_name.php\";\n" . " include \"\$file_name.php\";\n" .
" }\n" . " }\n" .
"}\n" . "}\n" .
"$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."));\n?>"; "$include_func_name(\"$include_file_name\", get_defined_vars(), array(".implode(',', (array)$arg_list)."), \$_smarty_config);\n?>";
} }
/*======================================================================*\ /*======================================================================*\
@@ -841,7 +850,7 @@ class Smarty_Compiler extends Smarty {
$var_name = substr($var_ref, 1, -1); $var_name = substr($var_ref, 1, -1);
$output = "\$GLOBALS['_smarty_config']['$var_name']"; $output = "\$_smarty_config['$var_name']";
$this->_parse_modifiers($output, $modifiers); $this->_parse_modifiers($output, $modifiers);