Ticket #7944: 7944.patch

_source/plugins/enterkey/plugin.js

@@ -58 +58 @@
                                 }
                         }
                         // Don't split <pre> if we're in the middle of it, act as shift enter key.
-                        else if ( !atBlockEnd && block && block.is( 'pre' ) )
-                                enterBr( editor, mode, range, forceMode );
+                        else if ( block && block.is( 'pre' ) )
+                        {
+                                if ( !atBlockEnd )
+                                        return enterBr( editor, mode, range, forceMode );
+                        }
+                        // Don't split caption block, like <caption> and <legend>. (#7944)
+                        else if ( block && !CKEDITOR.dtd[ block.getName() ][ 'p' ] )
+                                return enterBr( editor, mode, range, forceMode );
 
                         // Determine the block element to be used.
                         var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );

_source/core/dom/elementpath.js

@@ -6 +6 @@
 (function()
 {
         // Elements that may be considered the "Block boundary" in an element path.
-        var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1, legend:1 };
+        var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1, legend:1,caption:1 };
 
         // Elements that may be considered the "Block limit" in an element path.
-        var pathBlockLimitElements = { body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,caption:1,form:1,fieldset:1 };
+        var pathBlockLimitElements = { body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,form:1,fieldset:1 };
 
         // Check if an element contains any block element.
         var checkHasBlock = function( element )