Merge branch 't/13680'

Author: Reinmar

CHANGES.md

@@ -14,6 +14,7 @@ Fixed Issues:
 * [#13599](http://dev.ckeditor.com/ticket/13599): Fixed: Cross-editor D&D of inline widget ends up in error/artifacts.
 * [#13640](http://dev.ckeditor.com/ticket/13640): [IE] Fixed: Dropping a widget outside body is not handled correctly.
 * [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
+* [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow `<h1-6>` to be a child of the `<summary>` element.
 
 Other Changes:
 

core/dtd.js

@@ -194,7 +194,7 @@ CKEDITOR.dtd = ( function() {
 		strong: P,
 		style: T,
 		sub: P,
-		summary: P,
+		summary: X( { h1: 1, h2: 1, h3: 1, h4: 1, h5: 1, h6: 1 }, P ),
 		sup: P,
 		table: { caption: 1, colgroup: 1, thead: 1, tfoot: 1, tbody: 1, tr: 1 },
 		tbody: { tr: 1 },

tests/core/htmlparser/htmlparser.js

@@ -310,7 +310,13 @@
 				parser.parse( html );
 				assert.areSame( expectedTags, tags.join( ',' ), 'tags - ' + msg );
 			}
+		},
+
+		// #13680
+		'test header elements in summary tag': function() {
+			assert.areSame( '<summary><h2>Summary</h2></summary>',
+				htmlParse( '<summary><h2>Summary</h2></summary>' ) );
 		}
 	} );
 
-} )();
+} )();