Ticket #2117: 2117.patch

_whatsnew.html

@@ -122 +122 @@
                         Safari 3.1 browser bug which caused the Fit Window button to give a blank screen.</li> 
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2218">#2218</a>] Improved Gecko based browser
                         detection to accept Epiphany/Gecko as well.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2117">#2117</a>] Fixed the issue where the file
+                        browser does not work under domain relaxation mode under Firefox 2.x or lower.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/filemanager/browser/default/js/fckxml.js

@@ -61 +61 @@
                 {
                         if ( oXmlHttp.readyState == 4 )
                         {
-                                if ( ( oXmlHttp.status != 200 && oXmlHttp.status != 304 ) || oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null )
+                                var oXml ;
+                                try
                                 {
+                                        // this is the same test for an FF2 bug as in fckxml_gecko.js
+                                        // but we've moved the responseXML assignment into the try{}
+                                        // so we don't even have to check the return status codes.
+                                        var test = oXmlHttp.responseXML.firstChild ;
+                                        oXml = oXmlHttp.responseXML ;
+                                }
+                                catch ( e )
+                                {
+                                        try
+                                        {
+                                                oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+                                        }
+                                        catch ( e ) {}
+                                }
+
+                                if ( !oXml || !oXml.firstChild || oXml.firstChild.nodeName == 'parsererror' )
+                                {
                                         alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
                                                         'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')\n\n' +
                                                         'Requested URL:\n' + urlToCall + '\n\n' +
@@ -70 +88 @@
                                         return ;
                                 }
 
-                                oFCKXml.DOMDocument = oXmlHttp.responseXML ;
+                                oFCKXml.DOMDocument = oXml ;
                                 asyncFunctionPointer( oFCKXml ) ;
                         }
                 }