merging 6.8.5 bugfixes

This commit is contained in:
Roy Johnson 2006-01-17 00:57:44 +00:00
parent 67ea380786
commit 369af165f2
2 changed files with 4 additions and 0 deletions

View file

@ -11,6 +11,9 @@
- fix [ 1404485 ] userDefined1 to 5 onlineHelp
- fix [ 1403155 ] Poll shows no result
- fix [ 1373583 ] ITransact Module does not URL encode data within XML
- fix [ 1345363 ] Using RTE breaks links (Thanks to Gerald Young for
assisting with this one.)
- fix [ 1376148 ] wrong pages are shown after visit of photo gallery (Gerald Young)
6.8.4
- fix [ 1395371 ] XSS Vulnerability in DataForm Entries

View file

@ -11,6 +11,7 @@ function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
url = url.replace(/^\/\^/,"^");
url = url.replace(/http:\/\/\//,"/");
url = url.replace(/^.*(\^\/\;.*)$/,"$1");
url = url.replace(/^.*(\^FileUrl\(.*\)\;.*)$/,"$1");
return url;
}