update access to parent object

smarty-php · Apr 19, 2018 · fbbb292 · fbbb292
1 parent 8bea607
commit fbbb292
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/libs/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -53,7 +53,7 @@ public function getTemplateVars(Smarty_Internal_Data $data, $varName = null, Sma
                     }
                 }
                 // not found, try at parent
-                if ($searchParents) {
+                if ($searchParents && isset($_ptr->parent)) {
                     $_ptr = $_ptr->parent;
                 } else {
                     $_ptr = null;
@@ -93,7 +93,7 @@ public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Intern
                 return $_ptr->tpl_vars[ $varName ];
             }
             // not found, try at parent
-            if ($searchParents) {
+            if ($searchParents && isset($_ptr->parent)) {
                 $_ptr = $_ptr->parent;
             } else {
                 $_ptr = null;
@@ -103,14 +103,11 @@ public function _getVariable(Smarty_Internal_Data $data, $varName, Smarty_Intern
             // found it, return it
             return Smarty::$global_tpl_vars[ $varName ];
         }
-        /* @var \Smarty $smarty */
-        $smarty = isset($data->smarty) ? $data->smarty : $data;
-        if ($smarty->error_unassigned && $errorEnable) {
+        if ($errorEnable && $data->_getSmartyObj()->error_unassigned) {
             // force a notice
             $x = $$varName;
         }
 
         return new Smarty_Undefined_Variable;
     }
-
 }