Merge branch 't/9301c'

ckeditor · Oct 16, 2012 · ed293e1 · ed293e1
2 parents 4cd29d2 + cd05ac8
commit ed293e1
Show file tree

Hide file tree

Showing 3 changed files with 228 additions and 168 deletions.
diff --git a/core/dom/elementpath.js b/core/dom/elementpath.js
@@ -179,7 +179,9 @@ CKEDITOR.dom.elementPath.prototype = {
 
 		// Check for block context.
 		if ( tag in CKEDITOR.dtd.$block ) {
-			holder = ( this.root.equals( this.block ) && this.block ) || this.blockLimit;
+			// Indeterminate elements which are not subjected to be splitted or surrounded must be checked first.
+			var inter = this.contains( CKEDITOR.dtd.$intermediate );
+			holder = inter || ( this.root.equals( this.block ) && this.block ) || this.blockLimit;
 			return !!holder.getDtd()[ tag ];
 		}