Quick Fix on the xloadtree code about bad html specialchars escaping and xml encoding

diff --git a/classes/Misc.php b/classes/Misc.php
index 77e4ca1abe67cdc867f4b90f42a935133ed3d7c8..4afcc06eeadffd33c6f266ea059f635123e57d92 100644 (file)
--- 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 6218d78556f45672e8baa39a26a69ac73ffbf771..c7feecbc1f91f79306ea74d1c464f103b884acdb 100644 (file)
--- 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) {