From 8892f358ad65e7622af2c84583f0c5181e9f0ccc Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Sat, 7 Mar 2015 01:44:30 +0100
Subject: [PATCH] - bugfix __get() was called when loading config files

---
 libs/sysplugins/smarty_internal_extension_config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/sysplugins/smarty_internal_extension_config.php b/libs/sysplugins/smarty_internal_extension_config.php
index df90ad04..8cef300d 100644
--- a/libs/sysplugins/smarty_internal_extension_config.php
+++ b/libs/sysplugins/smarty_internal_extension_config.php
@@ -57,7 +57,7 @@ class Smarty_Internal_Extension_Config
         }
         // copy global config vars
         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;
             } else {
                 $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) {
                 if (isset($_config_vars['sections'][$_template_section])) {
                     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;
                         } else {
                             $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);