Ticket #4609: 4609_2.patch

_source/core/htmlparser/element.js

@@ -35 +35 @@
         this.children = [];
 
         var dtd                 = CKEDITOR.dtd,
-                isBlockLike     = !!( dtd.$block[ name ] || dtd.$listItem[ name ] || dtd.$tableContent[ name ] ),
+                isBlockLike     = !!( dtd.$block[ name ] || dtd.$listItem[ name ] || dtd.$tableContent[ name ] || dtd.$nonEditable ),
                 isEmpty         = !!dtd.$empty[ name ];
 
         this.isEmpty    = isEmpty;

_source/core/dtd.js

@@ -97 +97 @@
                  * @type Object
                  * @example
                  */
-                $nonEditable : {applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1},
+                $nonEditable : {applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1},
 
                 /**
                  * List of elements that can be ignored if empty, like "b" or "span".

_source/plugins/htmldataprocessor/plugin.js

@@ -209 +209 @@
         var protectStyleTagsRegex = /<(style)(?=[ >])[^>]*>[^<]*<\/\1>/gi;
         var encodedTagsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;
         var protectElementNamesRegex = /(<\/?)((?:object|embed|param).*?>)/gi;
-        var protectSelfClosingRegex = /<cke:param(.*?)\/>/gi;
+        var protectSelfClosingRegex = /<cke:(param|embed)(.*?)[/]?>/gi;
 
         function protectStyleTagsMatch( match )
         {
@@ -226 +226 @@
         }
         function protectSelfClosingElements( html )
         {
-                return html.replace( protectSelfClosingRegex, '<cke:param$1></cke:param>' );
+                return html.replace( protectSelfClosingRegex, '<cke:$1$2></cke:$1>' );
         }
 
         function unprotectEncodedTagsMatch( match, encoded )