Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 1691)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 1692)
@@ -66,4 +66,6 @@
 			[<a target="_blank" href="http://dev.fckeditor.net/ticket/1989">#1989</a>] 
 			Fixed XHTML source formatting errors in non-IE browsers.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2000">#2000</a>] The #
+			character is now properly encoded in file names returned by the File Browser.</li>
 	</ul>
 	<h3>
Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html	(revision 1691)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html	(revision 1692)
@@ -88,5 +88,5 @@
 function OpenFile( fileUrl )
 {
-	window.top.opener.SetUrl( encodeURI( fileUrl ) ) ;
+	window.top.opener.SetUrl( encodeURI( fileUrl ).replace( '#', '%23' ) ) ;
 	window.top.close() ;
 	window.top.opener.focus() ;