Ticket #22842: 22842.3.diff

wp-includes/js/tinymce/wp-tinymce-schema.js

@@ -131 +131 @@
                                         'img[A|alt|src|height|width|usemap|ismap|name|longdesc|align|border|hspace|vspace][]' +
                                         'iframe[A|name|src|height|width|sandbox|seamless|longdesc|frameborder|marginwidth|marginheight|scrolling|align][]' +
                                         'embed[A|src|height|width|type][]' +
-                                        'object[*][]' +
+                                        'object[*][C]' +
                                         'param[A|name|value|valuetype|type][]' +
                                         'details[A|open][C|legend]' +
                                         'command[A|type|label|icon|disabled|checked|radiogroup][]' +
@@ -139 +139 @@
                                         'legend[A|align][C|B]' +
                                         'div[A|align][C]' +
                                         'source[A|src|type|media][]' +
-                                        'audio[A|src|autobuffer|autoplay|loop|controls][source]' +
-                                        'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]' +
+                                        'track[A|kind|src|srclang|label|default][]' +
+                                        'audio[A|src|autobuffer|autoplay|loop|controls][C|source|track]' +
+                                        'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][C|source|track]' +
                                         'hr[A|align|noshade|size|width][]' +
                                         'form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target|onsubmit|onreset|accept][C]' +
                                         'fieldset[A|disabled|form|name][C|legend]' +

wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

@@ -135 +135 @@
                                 }
                         });
 
-                        // 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[embed]');
-                        });
-
                         ed.onInit.add(function(ed) {
                                 var bodyClass = ed.getParam('body_class', ''), body = ed.getBody();