Changeset 31201 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

01/16/2015 05:18:17 AM (12 years ago)

Author:

wonderboymusic

Message:

In wp_ajax_parse_media_shortcode(), don't require a global $post for all passed shortcodes.

embed is the only shortcode that requires a post ID. This will allow MCE views to work for playlist, audio, and video outside of the Edit Post screen.

See #30835.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

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

@@ -2726 +2726 @@
         global $post, $wp_scripts;
 
-        if ( ! $post = get_post( (int) $_POST['post_ID'] ) ) {
-                wp_send_json_error();
-        }
-
-        if ( empty( $_POST['shortcode'] ) || ! current_user_can( 'edit_post', $post->ID ) ) {
-                wp_send_json_error();
-        }
-
-        setup_postdata( $post );
-        $shortcode = do_shortcode( wp_unslash( $_POST['shortcode'] ) );
-
-        if ( empty( $shortcode ) ) {
+        if ( empty( $_POST['shortcode'] ) ) {
+                wp_send_json_error();
+        }
+
+        $shortcode = wp_unslash( $_POST['shortcode'] );
+
+        if ( ! empty( $_POST['post_ID'] ) ) {
+                $post = get_post( (int) $_POST['post_ID'] );
+        }
+
+        // the embed shortcode requires a post
+        if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
+                if ( 'embed' === $shortcode ) {
+                        wp_send_json_error();
+                }
+        } else {
+                setup_postdata( $post );
+        }
+
+        $parsed = do_shortcode( $shortcode  );
+
+        if ( empty( $parsed ) ) {
                 wp_send_json_error( array(
                         'type' => 'no-items',
@@ -2757 +2767 @@
         ob_start();
 
-        echo $shortcode;
+        echo $parsed;
 
         if ( 'playlist' === $_REQUEST['type'] ) {