Merge branch 't/11544'

CHANGES.md

@@ -5,6 +5,7 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
+* [#11544](http://dev.ckeditor.com/ticket/11544): Placeholders will no longer be upcasted in parents not accepting spans.
 * [#8663](http://dev.ckeditor.com/ticket/8663): Fixed [`element.renameNode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-renameNode) not clearing [`element.getName()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getName) cache.
 * [#11574](http://dev.ckeditor.com/ticket/11574): Fixed *Backspace* destroying DOM structure if inline editable is placed in list item.
 

core/htmlparser/filter.js

@@ -176,8 +176,8 @@
 				return this.attributeNameRules.execOnName( context, name );
 			},
 
-			onText: function( context, text ) {
-				return this.textRules.exec( context, text );
+			onText: function( context, text, node ) {
+				return this.textRules.exec( context, text, node );
 			},
 
 			onComment: function( context, commentText, comment ) {

plugins/placeholder/plugin.js

@@ -65,7 +65,14 @@
 			var placeholderReplaceRegex = /\[\[([^\[\]])+\]\]/g;
 
 			editor.dataProcessor.dataFilter.addRules( {
-				text: function( text ) {
+				text: function( text, node ) {
+					var dtd = node.parent && CKEDITOR.dtd[ node.parent.name ];
+
+					// Skip the case when placeholder is in elements like <title> or <textarea>
+					// but upcast placeholder in custom elements (no DTD).
+					if ( dtd && !dtd.span )
+						return;
+
 					return text.replace( placeholderReplaceRegex, function( match ) {
 						// Creating widget code.
 						var widgetWrapper = null,