This appears to fix #453, #498, #499 and possibly more issues. Will n…

…eed further testing and unit tests.
smarty-php · Jan 27, 2020 · 34763ae · 34763ae
1 parent 4b29dfc
commit 34763ae
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/libs/sysplugins/smarty_internal_templatecompilerbase.php b/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -627,16 +627,8 @@ public function compilePHPFunctionCall($name, $parameter)
                     if (count($parameter) === 0) {
                         $this->trigger_template_error('Illegal number of parameter in "isset()"');
                     }
-                    if ($parHasFuction) {
-                        $pa = array();
-                        foreach ($parameter as $p) {
-                            $pa[] = (strpos($p, '(') === false) ? ('isset(' . $p . ')') : ('(' . $p . ' !== null )');
-                        }
-                        return '(' . implode(' && ', $pa) . ')';
-                    } else {
-                        $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
-                    }
-                    return $name . '(' . $isset_par . ')';
+	                $isset_par = str_replace("')->value", "',null,true,false)->value", $par);
+                    return '@!is_null(' . $isset_par . ')';
                 } elseif (in_array(
                     $func_name,
                     array(