Changeset 15249

Timestamp:

06/14/2010 08:33:48 AM (15 years ago)

Author:

nacin

Message:

Treat trash/untrash of posts associated with media items the same as other stati changes. props koopersmith, see #13822.

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• nav-menu.php (modified) (4 diffs)

trunk/wp-includes/default-filters.php

@@ -232 +232 @@
 
 // Navigation menu actions
-add_action( 'trash_post',                 '_wp_trash_menu_item'            );
-add_action( 'untrash_post',               '_wp_untrash_menu_item'          );
 add_action( 'delete_post',                '_wp_delete_post_menu_item'      );
 add_action( 'delete_term',                '_wp_delete_tax_menu_item'       );

trunk/wp-includes/nav-menu.php

@@ -312 +312 @@
             $original_parent = (int) $original_object->post_parent;
             $original_title = $original_object->post_title;
-
-            if ( 'trash' == get_post_status( $args['menu-item-object-id'] ) )
-                return new WP_Error('update_nav_menu_item_failed', sprintf(__('The menu item "%1$s" belongs to something that is in the trash, so it cannot be updated.'), $args['menu-item-title'] ) );
         }
 
@@ -653 +650 @@
 
     return array_unique( $menu_item_ids );
-}
-
-/**
- * Callback for handling a menu item when its original object is trashed.
- *
- * @since 3.0.0
- * @access private
- *
- * @param int $object_id The ID of the original object being trashed.
- *
- */
-function _wp_trash_menu_item( $object_id = 0 ) {
-    $object_id = (int) $object_id;
-
-    $menu_item_ids = wp_get_associated_nav_menu_items( $object_id );
-
-    foreach( (array) $menu_item_ids as $menu_item_id ) {
-        $menu_item = get_post( $menu_item_id, ARRAY_A );
-        $menu_item['post_status'] = 'pending';
-        wp_insert_post($menu_item);
-    }
-}
-
-/**
- * Callback for handling a menu item when its original object is un-trashed.
- *
- * @since 3.0.0
- * @access private
- *
- * @param int $object_id The ID of the original object being untrashed.
- *
- */
-function _wp_untrash_menu_item( $object_id = 0 ) {
-    $object_id = (int) $object_id;
-
-    $menu_item_ids = wp_get_associated_nav_menu_items( $object_id );
-
-    foreach( (array) $menu_item_ids as $menu_item_id ) {
-        $menu_item = get_post( $menu_item_id, ARRAY_A );
-        $menu_item['post_status'] = 'publish';
-        wp_insert_post($menu_item);
-    }
 }
 
@@ -781 +736 @@
     // give menu items draft status if their associated post objects change from "publish" to "draft", or vice versa (draft item being re-published)
     if (
-        ! empty( $post->ID ) &&
-        (
-            ( 'publish' == $old_status && 'draft' == $new_status ) ||
-            ( 'draft' == $old_status && 'publish' == $new_status )
-        )
+        ( $new_status != $old_status ) &&
+        ! empty( $post->ID ) && ! empty( $post->post_type ) &&
+        'nav_menu_item' != $post->post_type && 
+        ( 'publish' == $old_status || 'publish' == $new_status )
     ) {
         $menu_items = get_posts(array(
@@ -797 +751 @@
             if ( ! empty( $menu_item->ID ) ) {
                 $properties = get_object_vars( $menu_item );
-                $properties['post_status'] = $new_status;
+                $properties['post_status'] = 'publish' == $new_status ? 'publish' : 'draft';
 
                 wp_insert_post( $properties );