Ticket #2689: 2689.patch

_whatsnew.html

@@ -50 +50 @@
                         About plugin shows misleading user language</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2821">#2821</a>] Configuration
                         items that used floating point numbers were parsed as integers.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2689">#2689</a>] If a 
+                        custom connector tried to use the "url" attribute for files it was always reencoded.</li>
                 <li>Language file updates for the following languages:
                         <ul>
                                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2849">#2849</a>] Lithuanian</li>

editor/filemanager/browser/default/frmresourceslist.html

@@ -89 +89 @@
 
 function OpenFile( fileUrl )
 {
-        window.top.opener.SetUrl( encodeURI( fileUrl ).replace( /#/g, '%23' ) ) ;
+        window.top.opener.SetUrl( fileUrl ) ;
         window.top.close() ;
         window.top.opener.focus() ;
 }
@@ -145 +145 @@
 
                 // Get the optional "url" attribute. If not available, build the url.
                 var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ;
-                var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : sCurrentFolderUrl + sFileName ;
+                var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : encodeURI( sCurrentFolderUrl + sFileName ).replace( /#/g, '%23' ) ;
 
                 oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ;
         }