Ticket #2163: 2163_2.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>

editor/_source/internals/fckregexlib.js

@@ -78 +78 @@
 
 Html4DocType    : /HTML 4\.0 Transitional/i ,
 DocTypeTag              : /<!DOCTYPE[^>]*>/i ,
+HtmlDocType             : /DTD HTML/ ,
 
 // These regex are used to save the original event attributes in the HTML.
 TagsWithEvent   : /<[^\>]+ on\w+[\s\r\n]*=[\s\r\n]*?('|")[\s\S]+?\>/g ,

editor/_source/internals/fckxhtml.js

@@ -70 +70 @@
         // Strip the "XHTML" root node.
         sXHTML = sXHTML.substr( 7, sXHTML.length - 15 ).Trim() ;
 
-        // Add a space in the tags with no closing tags, like <br/> -> <br />
-        sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />');
+        // According to the doctype set the proper end for self-closing tags
+        // HTML: <br>
+        // XHTML: Add a space, like <br/> -> <br />
+        if (FCKConfig.DocType.length > 0 && FCKRegexLib.HtmlDocType.test( FCKConfig.DocType ) )
+                sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, '>');
+        else
+                sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />');
 
         if ( FCKConfig.ForceSimpleAmpersand )
                 sXHTML = sXHTML.replace( FCKRegexLib.ForceSimpleAmpersand, '&' ) ;