Changeset 28754

Timestamp:

06/15/2014 10:52:45 PM (12 years ago)

Author:

azaozz

Message:

wpView: improve handling of embed errors/error messages, see #28195

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/js/mce-view.js (modified) (1 diff)
• wp-includes/js/tinymce/skins/wordpress/wp-content.css (modified) (1 diff)

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

@@ -2531 +2531 @@
         }
 
-        if ( ! current_user_can( 'read_post', $post->ID ) ) {
+        if ( empty( $_POST['shortcode'] ) || ! current_user_can( 'read_post', $post->ID ) ) {
                 wp_send_json_error();
         }
@@ -2537 +2537 @@
         setup_postdata( $post );
 
-        $parsed = $wp_embed->run_shortcode( $_POST['content'] );
+        // If the URL cannot be embedded, return an eror message with wp_send_json_error()
+        add_filter( 'embed_maybe_make_link', '_wpview_embed_error', 20, 2 );
+
+        $parsed = $wp_embed->run_shortcode( $_POST['shortcode'] );
         $parsed = do_shortcode( $parsed );
 

trunk/src/wp-admin/includes/misc.php

@@ -825 +825 @@
 // Run later as we have to set DOING_AUTOSAVE for back-compat
 add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
+
+/**
+ * Send error message when an URL cannot be embedded. Used in wp_ajax_parse_embed().
+ *
+ * @access private
+ * @since 4.0
+ */
+function _wpview_embed_error( $output, $url ) {
+        wp_send_json_error( array(
+                'message' => sprintf( __( '%s failed to embed.' ), esc_url( $url ) ),
+        ) );
+}

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

@@ -719 +719 @@
                         wp.ajax.send( 'parse-embed', {
                                 data: {
-                                        post_ID: $( '#post_ID' ).val(),
-                                        content: this.shortcode
+                                        post_ID: $( '#post_ID' ).val() || 0,
+                                        shortcode: this.shortcode
                                 }
                         } )
-                        .done( function( content ) {
+                        .always( function() {
                                 self.fetching = false;
-
-                                if ( content.substring( 0, ( '<a href' ).length ) === '<a href' ) {
+                        } )
+                        .done( function( response ) {
+                                if ( response ) {
+                                        self.parsed = response;
+                                        self.setHtml( response );
+                                }
+                        } )
+                        .fail( function( response ) {
+                                if ( response && response.message ) {
                                         if ( self.type === 'embed' ) {
-                                                self.setError( self.original + ' failed to embed.', 'admin-media' );
+                                                self.setError( response.message, 'admin-media' );
                                         } else {
-                                                self.setContent( self.original, null, true );
+                                                self.setContent( '<p>' + self.original + '</p>', null, true );
                                         }
-                                } else {
-                                        self.parsed = content;
-                                        self.setHtml( content );
-                                }
-                        } )
-                        .fail( function() {
-                                self.fetching = false;
-                                self.setError( self.original + ' failed to embed due to a server error.', 'admin-media' );
+                                } else if ( response && response.statusText ) {
+                                        self.setError( response.statusText, 'admin-media' );
+                                }
                         } );
                 },

trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -307 +307 @@
 .wpview-error {
         border: 1px solid #dedede;
-        padding: 20px 0;
-        margin: 0;
+        padding: 1em 0;
+        margin: 0;
+        word-wrap: break-word;
 }