Index: /trunk/src/wp-admin/includes/ajax-actions.php
===================================================================
--- /trunk/src/wp-admin/includes/ajax-actions.php (revision 40018)
+++ /trunk/src/wp-admin/includes/ajax-actions.php (revision 40019)
@@ -3005,5 +3005,4 @@
}
-
if ( ! empty( $no_ssl_support ) || ( is_ssl() && ( preg_match( '%<(iframe|script|embed) [^>]*src="http://%', $parsed ) ||
preg_match( '%]*href="http://%', $parsed ) ) ) ) {
@@ -3015,8 +3014,21 @@
}
- wp_send_json_success( array(
+ $return = array(
'body' => $parsed,
'attr' => $wp_embed->last_attr
- ) );
+ );
+
+ if ( strpos( $parsed, 'class="wp-embedded-content' ) ) {
+ if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+ $script_src = includes_url( 'js/wp-embed.js' );
+ } else {
+ $script_src = includes_url( 'js/wp-embed.min.js' );
+ }
+
+ $return['head'] = '';
+ $return['sandbox'] = true;
+ }
+
+ wp_send_json_success( $return );
}
Index: /trunk/src/wp-includes/class-wp-editor.php
===================================================================
--- /trunk/src/wp-includes/class-wp-editor.php (revision 40018)
+++ /trunk/src/wp-includes/class-wp-editor.php (revision 40019)
@@ -418,5 +418,4 @@
'wptextpattern',
'wpview',
- 'wpembed',
);
Index: /trunk/src/wp-includes/js/mce-view.js
===================================================================
--- /trunk/src/wp-includes/js/mce-view.js (revision 40018)
+++ /trunk/src/wp-includes/js/mce-view.js (revision 40019)
@@ -469,5 +469,5 @@
*/
setContent: function( content, callback, rendered ) {
- if ( _.isObject( content ) && content.body.indexOf( '