Ticket #12922: 12922.6.diff

src/wp-admin/admin-ajax.php

@@ -62 +62 @@
         'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
         'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
         'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
-        'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username', 'delete-plugin',
-        'search-plugins', 'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme',
-        'install-theme', 'test_url',
+        'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username',
+        'get-post-thumbnail-html', 'delete-plugin', 'search-plugins', 'search-install-plugins', 'activate-plugin',
+        'update-theme', 'delete-theme', 'install-theme', 'test_url',
 );
 
 // Deprecated

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

@@ -2164 +2164 @@
 }
 
 /**
+ * Ajax handler for retrieving HTML for the featured image.
+ *
+ * @since 4.6.0
+ */
+function wp_ajax_get_post_thumbnail_html() {
+        $post_ID = intval( $_POST['post_id'] );
+
+        check_ajax_referer( "update-post_$post_ID" );
+
+        if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+                wp_die( -1 );
+        }
+
+        $thumbnail_id = intval( $_POST['thumbnail_id'] );
+
+        // For backwards compatibility, -1 refers to no featured image.
+        if ( -1 === $thumbnail_id ) {
+                $thumbnail_id = null;
+        }
+
+        $return = _wp_post_thumbnail_html( $thumbnail_id, $post_ID );
+        wp_send_json_success( $return );
+}
+
+/**
  * Ajax handler for setting the featured image for an attachment.
  *
  * @since 4.0.0

src/wp-admin/includes/post.php

@@ -1428 +1428 @@
                                 $thumbnail_html
                         );
                         $content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __( 'Click the image to edit or update' ) . '</p>';
-                        $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
+                        $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
                 }
         }
 
+        $content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="' . esc_attr( $thumbnail_id ? $thumbnail_id : '-1' ) . '" />';
+
         /**
          * Filters the admin post thumbnail HTML markup to return.
          *
@@ -1753 +1755 @@
                 $query_args['preview_id'] = $post->ID;
                 $query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 
-                if ( isset( $_POST['post_format'] ) )
+                if ( isset( $_POST['post_format'] ) ) {
                         $query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+                }
+
+                if ( isset( $_POST['_thumbnail_id'] ) ) {
+                        $query_args['_thumbnail_id'] = ( 0 >= intval( $_POST['_thumbnail_id'] ) ) ? '-1' : intval( $_POST['_thumbnail_id'] );
+                }
         }
 
         return get_preview_post_link( $post, $query_args );

src/wp-includes/js/media-editor.js

@@ -649 +649 @@
 
                         settings.post.featuredImageId = id;
 
-                        wp.media.post( 'set-post-thumbnail', {
-                                json:         true,
+                        wp.media.post( 'get-post-thumbnail-html', {
                                 post_id:      settings.post.id,
                                 thumbnail_id: settings.post.featuredImageId,
                                 _wpnonce:     settings.post.nonce
                         }).done( function( html ) {
+                                if ( html == '0' ) {
+                                        window.alert( window.setPostThumbnailL10n.error );
+                                        return;
+                                }
                                 $( '.inside', '#postimagediv' ).html( html );
                         });
                 },
                 /**
+                 * Remove the featured image id, save the post thumbnail data and
+                 * set the HTML in the post meta box to no featured image.
+                 */
+                remove: function() {
+                        wp.media.featuredImage.set( -1 );
+                },
+                /**
                  * The Featured Image workflow
                  *
                  * @global wp.media.controller.FeaturedImage
@@ -735 +745 @@
 
                                 wp.media.featuredImage.frame().open();
                         }).on( 'click', '#remove-post-thumbnail', function() {
-                                wp.media.view.settings.post.featuredImageId = -1;
+                                wp.media.featuredImage.remove();
+                                return false;
                         });
                 }
         };

src/wp-includes/post.php

@@ -3260 +3260 @@
                 }
         }
 
+        if ( isset( $postarr['_thumbnail_id'] ) && ( post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type ) ) {
+                $thumbnail_id = intval( $postarr['_thumbnail_id'] );
+                if ( -1 === $thumbnail_id ) {
+                        delete_post_thumbnail( $post_ID );
+                } else {
+                        set_post_thumbnail( $post_ID, $thumbnail_id );
+                }
+        }
+
         if ( ! empty( $postarr['meta_input'] ) ) {
                 foreach ( $postarr['meta_input'] as $field => $value ) {
                         update_post_meta( $post_ID, $field, $value );

src/wp-includes/revision.php

@@ -530 +530 @@
         $post->post_excerpt = $preview->post_excerpt;
 
         add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
+        add_filter( 'get_post_metadata', '_wp_preview_post_thumbnail_filter', 10, 4 );
 
         return $post;
 }
@@ -578 +579 @@
 }
 
 /**
+ * Filters post thumbnail lookup to set the post thumbnail.
+ *
+ * @since 4.6.0
+ * @access private
+ *
+ * @param null|array|string $value     The value to return - a single metadata value, or an array of values.
+ * @param int               $post_id   Post ID.
+ * @param string            $meta_key  Meta key.
+ * @param bool              $single    Whether to return only the first value of the specified $meta_key.
+ * @return null|array The default return value or the post thumbnail meta array.
+ */
+function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key, $single ) {
+        if ( ! $post = get_post() ) {
+                return $value;
+        }
+
+        if ( empty( $_REQUEST['_thumbnail_id'] ) || $post->ID != $post_id || '_thumbnail_id' != $meta_key || 'revision' == $post->post_type ) {
+                return $value;
+        }
+
+        $thumbnail_id = intval( $_REQUEST['_thumbnail_id'] );
+        if ( 0 >= $thumbnail_id ) {
+                return '';
+        }
+
+        return strval( $thumbnail_id );
+}
+
+/**
  * Gets the post revision version.
  *
  * @since 3.6.0