1 files changed, 21 insertions, 37 deletions

diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
index 3cc957dec..272616148 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -204,13 +204,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
     public $blockOrFunctionCode = '';
 
     /**
-     * php_handling setting either from Smarty or security
-     *
-     * @var int
-     */
-    public $php_handling = 0;
-
-    /**
      * flags for used modifier plugins
      *
      * @var array
@@ -438,11 +431,6 @@ abstract class Smarty_Internal_TemplateCompilerBase
                 }
                 $this->smarty->_debug->start_compile($this->template);
             }
-            if (isset($this->template->smarty->security_policy)) {
-                $this->php_handling = $this->template->smarty->security_policy->php_handling;
-            } else {
-                $this->php_handling = $this->template->smarty->php_handling;
-            }
             $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
             $nocache = isset($nocache) ? $nocache : false;
             if (empty($template->compiled->nocache_hash)) {
@@ -627,11 +615,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         $this->trigger_template_error('Illegal number of parameter in "isset()"');
                     }
 
-	                $pa = array();
-	                foreach ($parameter as $p) {
-		                $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
-	                }
-	                return '(' . implode(' && ', $pa) . ')';
+                    $pa = array();
+                    foreach ($parameter as $p) {
+                        $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
+                    }
+                    return '(' . implode(' && ', $pa) . ')';
 
                 } elseif (in_array(
                     $func_name,
@@ -649,12 +637,8 @@ abstract class Smarty_Internal_TemplateCompilerBase
                         $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
                     }
                     if ($func_name === 'empty') {
-                        if (!$this->syntaxMatchesVariable($parameter[0]) && version_compare(PHP_VERSION, '5.5.0', '<')) {
-                            return '(' . $parameter[ 0 ] . ' === false )';
-                        } else {
-                            return $func_name . '(' .
-                                   str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
-                        }
+                        return $func_name . '(' .
+                               str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
                     } else {
                         return $func_name . '(' . $parameter[ 0 ] . ')';
                     }
@@ -667,16 +651,16 @@ abstract class Smarty_Internal_TemplateCompilerBase
         }
     }
 
-	/**
-	 * Determines whether the passed string represents a valid (PHP) variable.
-	 * This is important, because `isset()` only works on variables and `empty()` can only be passed
-	 * a variable prior to php5.5
-	 * @param $string
-	 * @return bool
-	 */
-	private function syntaxMatchesVariable($string) {
-    	static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
-    	return 1 === preg_match($regex_pattern, trim($string));
+    /**
+     * Determines whether the passed string represents a valid (PHP) variable.
+     * This is important, because `isset()` only works on variables and `empty()` can only be passed
+     * a variable prior to php5.5
+     * @param $string
+     * @return bool
+     */
+    private function syntaxMatchesVariable($string) {
+        static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
+        return 1 === preg_match($regex_pattern, trim($string));
     }
 
     /**
@@ -691,11 +675,11 @@ abstract class Smarty_Internal_TemplateCompilerBase
     {
 
         if (strpos($text, '<') === false) {
-        	return preg_replace($this->stripRegEx, '', $text);
+            return preg_replace($this->stripRegEx, '', $text);
         }
 
-	    $store = array();
-	    $_store = 0;
+        $store = array();
+        $_store = 0;
 
         // capture html elements not to be messed with
         $_offset = 0;
@@ -1151,7 +1135,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
             flush();
         }
         $e = new SmartyCompilerException($error_text);
-        $e->line = $line;
+        $e->setLine($line);
         $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
         $e->desc = $args;
         $e->template = $this->template->source->filepath;