Skip to content
Snippets Groups Projects
Commit c47c0c4d authored by Greg Boggs's avatar Greg Boggs
Browse files

Issue #3447908: Evaluating 1,000 breaks

parent 0ac9ebdb
No related branches found
No related tags found
1 merge request!3Resolve #3512141 "Drupal 11 readiness"
.idea
...@@ -167,6 +167,10 @@ class ExpressionItem extends FieldItemBase { ...@@ -167,6 +167,10 @@ class ExpressionItem extends FieldItemBase {
// Evaluate the final expression // Evaluate the final expression
$math = new EvalMath; $math = new EvalMath;
$math->suppress_errors = $this->getSetting('suppress_errors'); $math->suppress_errors = $this->getSetting('suppress_errors');
// remove blank spaces because 1 000 will evaluate to zero instead of 1000
$expression = str_replace(' ', '', $expression);
$value = $math->evaluate($expression); $value = $math->evaluate($expression);
// Support debugging expressions with devel module // Support debugging expressions with devel module
......
...@@ -146,6 +146,10 @@ trait ExpressionItemTrait { ...@@ -146,6 +146,10 @@ trait ExpressionItemTrait {
$math->suppress_errors = $this->getSetting('suppress_errors'); $math->suppress_errors = $this->getSetting('suppress_errors');
foreach ($expressions as $expr) { foreach ($expressions as $expr) {
if ($expr !== '') { if ($expr !== '') {
// remove blank spaces because 1 000 will evaluate to zero instead of 1000
$expr = str_replace(' ', '', $expr);
$result = $math->evaluate($expr); $result = $math->evaluate($expr);
if ($result == false) { if ($result == false) {
$result = 0; $result = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment