Ticket #5079: 5079_2.patch

_source/plugins/pagebreak/plugin.js

@@ -82 +82 @@
                 // Creates the fake image used for this element.
                 breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' );
 
-                var ranges = editor.getSelection().getRanges();
+                var selection = editor.getSelection(),
+                                ranges = selection && selection.getRanges();
 
-                for ( var range, i = 0 ; i < ranges.length ; i++ )
+                for ( var range, i = 0; i < ranges.length; i++ )
                 {
                         range = ranges[ i ];
 
-                        if ( i > 0 )
-                                breakObject = breakObject.clone( true );
+                        var current;
+                        // Split up only inline elements.
+                        while ( ( current = range.getCommonAncestor( false, true ) )
+                                        && CKEDITOR.dtd.$inline[ current.getName() ] )
+                                range.splitElement( current );
 
-                        range.splitBlock( 'p' );
+                        i && ( breakObject = breakObject.clone( true ) );
                         range.insertNode( breakObject );
+                        range.setStartAfter( breakObject );
                 }
+
+                selection.selectRanges( ranges );
         }
 };