Author: sdumitriu Date: 2008-06-12 05:17:43 +0200 (Thu, 12 Jun 2008) New Revision: 10277 Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/ editwysiwyg.vm xwiki-platform/web/trunk/standard/src/main/webapp/wiki_editor/ plugins/attachments.js Log: XWIKI-1284: Image disappears from WYSIWYG editor in documents with special characters in name Fixed.

Modified: xwiki-platform/web/trunk/standard/src/main/webapp/ wiki_editor/plugins/attachments.js =================================================================== --- xwiki-platform/web/trunk/standard/src/main/webapp/wiki_editor/ plugins/attachments.js 2008-06-12 01:39:44 UTC (rev 10276) +++ xwiki-platform/web/trunk/standard/src/main/webapp/wiki_editor/ plugins/attachments.js 2008-06-12 03:17:43 UTC (rev 10277) @@ -44,7 +44,7 @@ var contextPathImage = tinyMCE.getParam("wiki_images_path").toString(); href = contextPathImage.substring(0, contextPathImage.indexOf("/",2)) + "/bin/" + href.substring(href.indexOf("/",3) + 1); - href = unescape(href); +// href = unescape(href);

var imgname_reg = new RegExp(this.getImagePath() + "(.*)", "i"); var r = imgname_reg.exec(href); if(r) { @@ -82,7 +82,7 @@ if (halign != "") { str += "<div class=\"img" + halign + "\">" } - str += "<img id=\"" + result[1] + "\" class=\"" + this.IMAGE_CLASS_NAME + "\" src=\"" + this.getImagePath() + result[1] + "\" "; + str += "<img id=\"" + result[1] + "\" class=\"" + this.IMAGE_CLASS_NAME + "\" src=\"" + escape(this.getImagePath() + result[1]) + "\" "; if( result[5] && (width = this.trimString(result[5])) != "") { str += "width=\"" + width + "\" "; }