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

- bugfix __get() was called when loading config files

Browse Source
This commit is contained in:
Uwe Tews
2015-03-07 01:44:30 +01:00
parent b1cd4cd7d2
commit 8892f358ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/sysplugins/smarty_internal_extension_config.php
View File

@@ -57,7 +57,7 @@ class Smarty_Internal_Extension_Config
} }
// copy global config vars // copy global config vars
foreach ($_config_vars['vars'] as $variable => $value) { foreach ($_config_vars['vars'] as $variable => $value) {
if ($_template->config_overwrite || !isset($scope_ptr->config_vars[$variable])) { if ($_template->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
$scope_ptr->config_vars[$variable] = $value; $scope_ptr->config_vars[$variable] = $value;
} else { } else {
$scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value); $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
@@ -69,7 +69,7 @@ class Smarty_Internal_Extension_Config
foreach ((array) $sections as $_template_section) { foreach ((array) $sections as $_template_section) {
if (isset($_config_vars['sections'][$_template_section])) { if (isset($_config_vars['sections'][$_template_section])) {
foreach ($_config_vars['sections'][$_template_section]['vars'] as $variable => $value) { foreach ($_config_vars['sections'][$_template_section]['vars'] as $variable => $value) {
if ($_template->config_overwrite || !isset($scope_ptr->config_vars[$variable])) { if ($_template->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
$scope_ptr->config_vars[$variable] = $value; $scope_ptr->config_vars[$variable] = $value;
} else { } else {
$scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value); $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);