From 0d084fbd8f584a7fd5a94778963b5edfbff4edb2 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Mon, 10 Dec 2012 02:44:25 +0000
Subject: [PATCH] TinyMCE: Use the correct syntax for allowing an `embed`
 element to be a valid child of an `object` element.

Fixes a bug in TinyMCE when using its HTML5 schema definition.

props azaozz.
fixes #22790.
for the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
index e5a512d631..89b2771f89 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
@@ -138,7 +138,7 @@
 			// Extend <object> and <embed> (#WP22790)
 			ed.onPreInit.add(function(ed) {
 				ed.schema.addValidElements('object[*],param[id|name|value|valuetype|type],embed[*]');
-				ed.schema.addValidChildren('object[*]');
+				ed.schema.addValidChildren('+object[embed]');
 			});
 
 			ed.onInit.add(function(ed) {