Changeset 29546

Timestamp:

08/19/2014 11:22:47 PM (12 years ago)

Author:

azaozz

Message:

TinyMCE wpView: show an error when no items are found while parsing a audio/video/playlist shortcode. Props avryl, fixes #29114.

File:

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

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

@@ -2716 +2716 @@
     }
 
+    if ( empty( $_POST['shortcode'] ) || ! current_user_can( 'edit_post', $post->ID ) ) {
+        wp_send_json_error();
+    }
+
     setup_postdata( $post );
+    $shortcode = do_shortcode( wp_unslash( $_REQUEST['shortcode'] ) );
+
+    if ( empty( $shortcode ) ) {
+        wp_send_json_error( array( 'statusText' => __( 'No items found.' ) ) );
+    }
 
     ob_start();
@@ -2725 +2734 @@
     }
 
-    echo do_shortcode( wp_unslash( $_REQUEST['shortcode'] ) );
+    echo $shortcode;
 
     if ( ! empty( $wp_scripts ) ) {