Ticket #2056: 2056.patch

_whatsnew.html

@@ -41 +41 @@
                 now use sampleposteddata.php in action parameter inside a form.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2150">#2150</a>] The searching
                         speed of the Find/Replace dialog has been vastly improved.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2163">#2163</a>] If the FCKConfig.DocType
+                        setting points to a HTML DocType then the output won't generate self-closing tags (it will output 
+                        &lt;img &gt; instead of &lt;img /&gt;).</li>
         </ul>
         <p>
                 Fixed Bugs:</p>
@@ -88 +91 @@
                         paragraphs in the output.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2184">#2184</a>] Fixed several validation 
                         errors in the File Browser.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2056">#2056</a>] Fixed several validation 
+                        errors in the dialogs.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/dialog/fck_flash.html

@@ -97 +97 @@
                                 <br />
                                 <input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
                                 <script type="text/javascript">
-                                        document.write( '<iframe name="UploadWindow" style="DISPLAY: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
+                                        document.write( '<iframe name="UploadWindow" style="DISPLAY: none" src="' + FCKTools.GetVoidUrl() + '"><\/iframe>' ) ;
                                 </script>
                         </form>
                 </div>

editor/dialog/fck_image.html

@@ -165 +165 @@
                         <br />
                         <input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
                         <script type="text/javascript">
-                                document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
+                                document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"><\/iframe>' ) ;
                         </script>
                 </form>
         </div>

editor/dialog/fck_link.html

@@ -108 +108 @@
                                 <input id="txtUploadFile" style="WIDTH: 100%" type="file" size="40" name="NewFile" /><br />
                                 <br />
                                 <input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
-                                <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
+                                <script type="text/javascript">
+                                        document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"><\/iframe>' ) ;
+                                </script>
                         </form>
                 </div>
                 <div id="divTarget" style="DISPLAY: none">

editor/fckdialog.html

@@ -630 +630 @@
                 E.FCKLanguageManager.TranslatePage( document ) ;
 
                 // Create the IFRAME that holds the dialog contents.
-                $( 'innerContents' ).innerHTML = '<iframe id="frmMain" src="' + Args().Page + '" name="frmMain" frameborder="0" width="100%" height="100%" scrolling="auto" style="visibility: hidden;" allowtransparency="true"></iframe>' ;
+                $( 'innerContents' ).innerHTML = '<iframe id="frmMain" src="' + Args().Page + '" name="frmMain" frameborder="0" width="100%" height="100%" scrolling="auto" style="visibility: hidden;" allowtransparency="true"><\/iframe>' ;
         } ;
 
         window.InnerDialogLoaded = function()