Merge branch 't/12411'

Author: Reinmar

CHANGES.md

@@ -20,6 +20,7 @@ Fixed Issues:
 * [#12163](http://dev.ckeditor.com/ticket/12163): Fixed: Maximize plugin should abort its initialization if the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is initialized.
 * [#12398](http://dev.ckeditor.com/ticket/12398): Fixed: Maximize does not work on instance without a [title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
 * [#12097](http://dev.ckeditor.com/ticket/12097): Fixed: JAWS not reading number of list options correctly in colors list box.
+* [#12411](http://dev.ckeditor.com/ticket/12411): Fixed: [Page Break](http://ckeditor.com/addon/pagebreak) used directly in the editable breaks the editor.
 
 ## CKEditor 4.4.4
 

plugins/pagebreak/plugin.js

@@ -134,7 +134,7 @@
 			span: {
 				match: function( element ) {
 					var parent = element.parent;
-					return parent && parent.name == 'div' && parent.styles[ 'page-break-after' ];
+					return parent && parent.name == 'div' && parent.styles && parent.styles[ 'page-break-after' ];
 				},
 				styles: 'display'
 			}

tests/plugins/pagebreak/pagebreak.js

@@ -63,6 +63,22 @@
 			editor.execCommand( 'paste', html );
 
 			wait();
+		},
+
+		// #12411
+		'test span as a direct child no break': function() {
+			bender.editorBot.create( {
+				name: 'editor2',
+				startupData: '<span>he?</span>',
+				config: {
+					autoParagraph: false,
+					extraPlugins: 'divarea'
+				}
+			},
+			function( bot ) {
+				// If we get here it means that nothing fails :)
+				assert.pass();
+			} );
 		}
 	} );
 } )();