From ca495758bd8bcbea66f00296d36d87f66cd5f4a8 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Wed, 14 Aug 2013 23:06:43 +0200 Subject: Fix octemplate string escaping. --- core/js/octemplate.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/js/octemplate.js') diff --git a/core/js/octemplate.js b/core/js/octemplate.js index e69c6cc56e0..f7ee316f3b2 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -60,9 +60,9 @@ var self = this; if(typeof this.options.escapeFunction === 'function') { - for (var key = 0; key < this.vars.length; key++) { - if(typeof this.vars[key] === 'string') { - this.vars[key] = self.options.escapeFunction(this.vars[key]); + for (var key = 0; key < Object.keys(this.vars).length; key++) { + if(typeof this.vars[Object.keys(this.vars)[key]] === 'string') { + this.vars[Object.keys(this.vars)[key]] = self.options.escapeFunction(this.vars[Object.keys(this.vars)[key]]); } } } @@ -85,7 +85,7 @@ } }, options: { - escapeFunction: function(str) {return $('').text(str).html();} + escapeFunction: escapeHTML } }; -- cgit v1.2.3