Ticket #2036: 2036.patch

_whatsnew.html

@@ -52 +52 @@
                         colored text.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1952">#1952</a>] Fixed
                         an issue in FCKTools.FixCssUrls that, other than wrong, was breaking Opera.</li>
-<<<<<<< .mine
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1695">#1695</a>] Removed
                         Ctrl-Tab hotkey for Source mode and allowed Ctrl-T to work in Firefox.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1666">#1666</a>] Fixed 

editor/_source/classes/fckpanel.js

@@ -45 +45 @@
                 // This is a trick to IE6 (not IE7). The original domain must be set
                 // before creating the popup, so we are able to take a refence to the
                 // document inside of it, and the set the proper domain for it. (#123)
-                if ( FCK_IS_CUSTOM_DOMAIN )
+                if ( FCK_IS_CUSTOM_DOMAIN && !FCKBrowserInfo.IsIE7 )
                 {
                         pDoc.domain = FCK_ORIGINAL_DOMAIN ;
                         document.domain = FCK_ORIGINAL_DOMAIN ;