From ac2a3243b5427e0d5aefcb49251ae73a8bd5790a Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 25 Sep 2014 12:04:52 +0200
Subject: [PATCH] Don't cache regexes and avoid the _re hack

---
 lib/cartodb/template_maps.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/cartodb/template_maps.js b/lib/cartodb/template_maps.js
index 63b16971..6b76f9d9 100644
--- a/lib/cartodb/template_maps.js
+++ b/lib/cartodb/template_maps.js
@@ -537,14 +537,10 @@ o._reCSSColorVal = /^#[0-9a-fA-F]{3,6}$/;
 o._replaceVars = function(str, params) {
   //return _.template(str, params); // lazy way, possibly dangerous 
   // Construct regular expressions for each param
-  if ( ! params._re ) {
-    params._re = {};
-    for (var k in params) {
-      params._re[k] = RegExp("<%=\\s*" + k + "\\s*%>", "g");
-    }
-  }
-  for (var k in params) str = str.replace(params._re[k], params[k]);
-  return str;
+    Object.keys(params).forEach(function(k) {
+        str = str.replace(new RegExp("<%=\\s*" + k + "\\s*%>", "g"), params[k]);
+    });
+    return str;
 };
 o.instance = function(template, params) {
   var all_params = {};