Ticket #2163: 2163.patch

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 && /DTD HTML/.test( FCKConfig.DocType ) )
+                sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, '>');
+        else
+                sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />');
 
         if ( FCKConfig.ForceSimpleAmpersand )
                 sXHTML = sXHTML.replace( FCKRegexLib.ForceSimpleAmpersand, '&' ) ;