Force toString in escapeExpression

Fixes #211
handlebars-lang · Apr 6, 2013 · 671c07e · 671c07e
1 parent f4d0092
commit 671c07e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/dist/handlebars.js b/dist/handlebars.js
@@ -825,6 +825,11 @@ Handlebars.Utils = {
       return "";
     }
 
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = string.toString();
+
     if(!possible.test(string)) { return string; }
     return string.replace(badChars, escapeChar);
   },

diff --git a/dist/handlebars.runtime.js b/dist/handlebars.runtime.js
@@ -211,6 +211,11 @@ Handlebars.Utils = {
       return "";
     }
 
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = string.toString();
+
     if(!possible.test(string)) { return string; }
     return string.replace(badChars, escapeChar);
   },

diff --git a/lib/handlebars/utils.js b/lib/handlebars/utils.js
@@ -47,6 +47,11 @@ Handlebars.Utils = {
       return "";
     }
 
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = string.toString();
+
     if(!possible.test(string)) { return string; }
     return string.replace(badChars, escapeChar);
   },