Ticket #7354: 7354_2.patch

_source/plugins/enterkey/plugin.js

@@ -48 +48 @@
                                 path = new CKEDITOR.dom.elementPath( range.startContainer ),
                                 block = path.block;
 
-                        // Exit the list when we're inside an empty list item block. (#5376)
                         if ( atBlockStart && atBlockEnd )
                         {
+                                // Exit the list when we're inside an empty list item block. (#5376)
                                 if ( block && ( block.is( 'li' ) || block.getParent().is( 'li' ) ) )
                                 {
                                         editor.execCommand( 'outdent' );
                                         return;
                                 }
+
+                                if ( block && block.getParent().is( 'blockquote' ) )
+                                {
+                                        block.breakParent( block.getParent() );
+
+                                        // If we were at the start of <blockquote>, there will be an empty element before it now.
+                                        if ( !block.getPrevious().getFirst( CKEDITOR.dom.walker.invisible(1) ) )
+                                                block.getPrevious().remove();
+
+                                        // If we were at the end of <blockquote>, there will be an empty element after it now.
+                                        if ( !block.getNext().getFirst( CKEDITOR.dom.walker.invisible(1) ) )
+                                                block.getNext().remove();
+
+                                        range.moveToElementEditStart( block );
+                                        range.select();
+                                        return;
+                                }
                         }
                         // Don't split <pre> if we're in the middle of it, act as shift enter key.
                         else if ( block && block.is( 'pre' ) )