Ticket #15192: 15192.diff

wp-includes/post.php

@@ -5211 +5211 @@
         endif;
 }
 
+/**
+ * Attach a thumbnail to a post.
+ *
+ * @since 3.1
+ *
+ * @param int int|object $post The post for which to assign a thumbnail.
+ * @param int $thumbnail_id. The thumbnail to assign ID.
+ * @return bool Whether post has an image attached.
+ */
+function set_post_thumbnail( $post, $thumbnail_id ) {
+        $post = get_post($post);
+        if ( empty($post) )
+                return new WP_Error('invalid_post', __('Invalid post'));
+
+        if ( !wp_attachment_is_image($thumbnail_id) )
+                return new WP_Error('invalid_attachment', __('The attachment is not an image'));
+
+        return update_post_meta($post->ID, '_thumbnail_id', $thumbnail_id);
+}
+
 ?>

wp-admin/admin-ajax.php

@@ -744 +744 @@
         require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
         /**
-         * For performance reasons, we omit some object properties from the checklist.
+         * For performance reasons, we omit some object properties from the checklist.
          * The following is a hacky way to restore them when adding non-custom items.
          */
         $menu_items_data = (array) $_POST['menu-item'];
-        $menu_item_data = array_shift( $menu_items_data );
-        if (
-                ! empty( $menu_item_data['menu-item-type'] ) &&
+        $menu_item_data = array_shift( $menu_items_data );
+        if (
+                ! empty( $menu_item_data['menu-item-type'] ) &&
                 'custom' != $menu_item_data['menu-item-type'] &&
                 ! empty( $menu_item_data['menu-item-object-id'] )
         ) {
@@ -760 +760 @@
                         break;
 
                         case 'taxonomy' :
-                                $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
+                                $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
                         break;
                 }
 
-                $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
+                $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
                 $_menu_item = array_shift( $_menu_items );
 
                 /** Restore the missing menu item properties **/
@@ -1097 +1097 @@
         require_once ABSPATH . WPINC . '/js/tinymce/wp-mce-link-includes.php';
 
         wp_link_ajax( $_POST );
-
+
         exit;
         break;
 case 'menu-locations-save':
@@ -1452 +1452 @@
                 die( _wp_post_thumbnail_html() );
         }
 
-        if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
-                $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' );
-                if ( !empty( $thumbnail_html ) ) {
-                        update_post_meta( $post_ID, '_thumbnail_id', $thumbnail_id );
+        if ( $thumbnail_id ) {
+                $set_post_thumbnail = set_post_thumbnail( $post_ID, $thumbnail_id );
+                if ( $set_post_thumbnail && !is_wp_error( $set_post_thumbnail ) )
                         die( _wp_post_thumbnail_html( $thumbnail_id ) );
-                }
         }
         die( '0' );
         break;