Changeset 28580

Timestamp:

05/26/2014 11:42:08 PM (10 years ago)

Author:

wonderboymusic

Message:

Don't pass embeds through the_content() when trying to render MCE previews, leverage WP_Embed and do_shortcode() instead.

Props kovshenin.
See #28195.

Location:

trunk/src

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/js/mce-view.js (modified) (1 diff)

trunk/src/wp-admin/admin-ajax.php

@@ -61 +61 @@
     'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
     'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
-    'save-user-color-scheme', 'update-widget', 'query-themes', 'filter-content'
+    'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed'
 );
 

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2507 +2507 @@
 
 /**
- * Apply `the_content` filters to a string based on the post ID.
+ * Apply [embed] handlers to a string.
  *
  * @since 4.0.0
  */
-function wp_ajax_filter_content() {
-    global $post;
+function wp_ajax_parse_embed() {
+    global $post, $wp_embed;
 
     if ( ! $post = get_post( (int) $_REQUEST['post_ID'] ) ) {
@@ -2524 +2524 @@
     setup_postdata( $post );
 
-    wp_send_json_success( apply_filters( 'the_content', wp_unslash( $_POST['content'] ) ) );
-}
+    $parsed = $wp_embed->run_shortcode( $_POST['content'] );
+    if ( preg_match( '/' . get_shortcode_regex() . '/s', $parsed ) ) {
+        $parsed = do_shortcode( $parsed );
+    }
+    wp_send_json_success( $parsed );
+}

trunk/src/wp-includes/js/mce-view.js

@@ -709 +709 @@
             },
             fetch: function () {
-                wp.ajax.send( 'filter-content', {
+                wp.ajax.send( 'parse-embed', {
                     data: {
                         post_ID: $( '#post_ID' ).val(),