- improvement {math} misleading E_NOTICE messages when parameter valu…

…e = null #288 (reverted from commit 810881c)
smarty-php · Sep 10, 2016 · 7e23071 · 7e23071
1 parent 810881c
commit 7e23071
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -1,7 +1,4 @@
 ===== 3.1.31-dev ===== (xx.xx.xx)
- 11.09.2016
-  - improvement {math} misleading E_NOTICE messages when parameter value = null https://github.com/smarty-php/smarty/issues/288
-
  09.09.2016
   - bugfix/optimization {foreach} did not execute the {foreachelse} when iterating empty objects https://github.com/smarty-php/smarty/pull/287
   - bugfix {foreach} must keep the @properties when restoring a saved $item variable as the properties might be used outside {foreach} https://github.com/smarty-php/smarty/issues/267

diff --git a/libs/plugins/function.math.php b/libs/plugins/function.math.php
@@ -58,35 +58,30 @@ function smarty_function_math($params, $template)
         return;
     }
 
-    foreach ($params as $key => $val) {
-        if ($key != "equation" && $key != "format" && $key != "assign") {
-            // make sure value is not empty
-            if (strlen($val) == 0) {
-                trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
-
-                return;
-            }
-            if (!is_numeric($val)) {
-                trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
-
-                return;
-            }
-        }
-    }
-
     // match all vars in equation, make sure all are passed
     preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
 
     foreach ($match[ 1 ] as $curr_var) {
         if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
-            trigger_error("math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'", E_USER_WARNING);
+            trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
 
             return;
         }
     }
 
     foreach ($params as $key => $val) {
         if ($key != "equation" && $key != "format" && $key != "assign") {
+            // make sure value is not empty
+            if (strlen($val) == 0) {
+                trigger_error("math: parameter $key is empty", E_USER_WARNING);
+
+                return;
+            }
+            if (!is_numeric($val)) {
+                trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
+
+                return;
+            }
             $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
         }
     }