Fixed issue #15011: Regular expression - issue - LimeSurvey "removes" 0

LimeSurvey · Jul 3, 2019 · 1ce7be1 · 1ce7be1 · Shnoulle · Jul 3, 2019
1 parent 6c6f350
commit 1ce7be1
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/assets/scripts/expressions/em_javascript.js b/assets/scripts/expressions/em_javascript.js
@@ -1044,12 +1044,18 @@ function LEMval(alias)
             }
             else if(!isNaN(parseFloat(value)) && isFinite(value))
             {
-                // If it's not a decimal number, just return value
-                try {
-                    var decimal_safe = new Decimal(value);
-                    return Number(decimal_safe.toPrecision(value.length));
+                var length = value.length;
+                var firstLetterIsNull = value.split("").shift() === '0';
+                try{
+                    var numtest = new Decimal(value);
+                } catch(e){
+                    var numtest = new Decimal(value.toString().replace(/,/,'.'));
                 }
-                catch (ex) {
+                value = numtest.valueOf();
+                if(value.length < length && firstLetterIsNull){
+                    value = str_repeat('0', length).substr(0,(length - value.length))+''+value.toString(); /* return string as it is */
+                } else {
+                    value = Number(value); /* If it's a number : always return a number */
                 }
             }