summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJehan-Guillaume (ioguix) de Rorthais2010-09-29 15:52:09 +0000
committerGuillaume (ioguix) de Rorthais2010-09-29 15:52:09 +0000
commitc5d4865fdc57d7fb747c78acbe0e54c3e69170a4 (patch)
tree6186add061d7ccabc15ff2f950329474de2b8c6d
parent942f7e2dfb6981fe2dc5ddfa88deefdc55597744 (diff)
Quick Fix on the xloadtree code about bad html specialchars escaping and xml encoding
-rw-r--r--classes/Misc.php2
-rw-r--r--xloadtree/xtree2.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/Misc.php b/classes/Misc.php
index 77e4ca1a..4afcc06e 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -1833,7 +1833,7 @@
header("Content-Type: text/xml");
header("Cache-Control: no-cache");
- echo "<?xml version=\"1.0\"?>\n";
+ echo "<?xml version=\"1.0\" encoding=\"", htmlspecialchars($lang['appcharset']), "\"?>\n";
echo "<tree>\n";
}
diff --git a/xloadtree/xtree2.js b/xloadtree/xtree2.js
index 6218d785..c7feecbc 100644
--- a/xloadtree/xtree2.js
+++ b/xloadtree/xtree2.js
@@ -257,7 +257,7 @@ var webFXTreeHandler = {
},
textToHtml: function (s) {
- return String(s).replace(/&|<|>|\n|\"\u00A0/g, this._textToHtml);
+ return String(s).replace(/&|<|>|\n|\"|\u00A0/g, this._textToHtml);
},
_textToHtml: function (s) {