diff options
| -rw-r--r-- | core/js/octemplate.js | 8 | ||||
| -rw-r--r-- | lib/base.php | 2 |
2 files changed, 5 insertions, 5 deletions
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 $('<i></i>').text(str).html();} + escapeFunction: escapeHTML } }; diff --git a/lib/base.php b/lib/base.php index eaee8424651..18c172759b4 100644 --- a/lib/base.php +++ b/lib/base.php @@ -257,8 +257,8 @@ class OC { OC_Util::addScript("compatibility"); OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("oc-dialogs"); - OC_Util::addScript("octemplate"); OC_Util::addScript("js"); + OC_Util::addScript("octemplate"); OC_Util::addScript("eventsource"); OC_Util::addScript("config"); //OC_Util::addScript( "multiselect" ); |