wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix octemplate string escaping.

Browse source
This commit is contained in:
Thomas Tanghus 2013-08-14 23:06:43 +02:00
parent 75e9015b54
commit ca495758bd
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/js/octemplate.js
View file

@ -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
}
};

2
lib/base.php
View file

@ -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" );