commit f210f91d773da892cb4d4a53467a41a06301d237
author Kulanthaivel Palanichamy <kulanthaivel@codeaurora.org> Thu Apr 16 18:01:56 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:46 2015 +0200
tree 9ddd236c1eb5883f1af224564565d898aa5f24de
parent 4a6838a6f0e18018663b6ecd69559090ef25cd73

Fix for WML postfield variable resolution issue

SWE-4364

assets/wml/swe_wml.js

diff --git a/assets/wml/swe_wml.js b/assets/wml/swe_wml.js
index 9b35023..2a5967e 100755
--- a/assets/wml/swe_wml.js
+++ b/assets/wml/swe_wml.js
@@ -351,14 +351,19 @@
 
 function substituteVariablesInPostfield(value)
 {
-    var pattern = /(\$\(([_a-z]{1}[_a-z0-9]*)([:]{1}((([e]{1})(scape)?)|(([n]{1})(oesc)?)|(([u]{1})(nesc)?)))?\))/gi;
+    var pattern1 = /(\$\(([_a-z]{1}[_a-z0-9]*)([:]{1}((([e]{1})(scape)?)|(([n]{1})(oesc)?)|(([u]{1})(nesc)?)))?\))/gi;
+    var pattern2 = /(\$([_a-zA-z]{1}[_a-zA-Z0-9]*))/g;
     var replacer = function () {
         var name = arguments[2];
         // TODO: Do the URL escaping here
         console.log("substituteVariablesInPostfield() found variable : " + arguments[0]);
         return WMLBrowser.getVar(name);
     };
-    return value.replace(pattern, replacer);
+    if (pattern1.test(value)) {
+        return value.replace(pattern1, replacer);
+    } else if (pattern2.test(value)) {
+        return value.replace(pattern2, replacer);
+    }
 }
 
 function refreshVariableInSelectElement(select)