Changeset 20739

Timestamp:

05/08/2012 05:01:50 PM (14 years ago)

Author:

ryan

Message:

Don't delete nav menu items when the user that owns them is deleted.

• Introduce delete_with_user flag to register_post_type
• Set delete_with_user to false for the nav_menu_item post type
• Set it to true for all other core post types
• If delete_with_user is not set, fallback to post_type_supports('author')

Props nacin
Fixes #16358

Location:

trunk

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-includes/post.php (modified) (7 diffs)

trunk/wp-admin/includes/user.php

@@ -244 +244 @@
 
         if ( 'novalue' === $reassign || null === $reassign ) {
-                $post_ids = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id) );
-
+                $post_types_to_delete = array();
+                foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
+                        if ( $post_type->delete_with_user ) {
+                                $post_types_to_delete[] = $post_type->name;
+                        } elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+                                $post_types_to_delete[] = $post_type->name;
+                        }
+                }
+
+                $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
+                $post_types_to_delete = implode( "', '", $post_types_to_delete );
+                $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
                 if ( $post_ids ) {
                         foreach ( $post_ids as $post_id )
-                                wp_delete_post($post_id);
+                                wp_delete_post( $post_id );
                 }
 

trunk/wp-includes/post.php

@@ -30 +30 @@
                 'rewrite' => false,
                 'query_var' => false,
+                'delete_with_user' => true,
                 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
         ) );
@@ -46 +47 @@
                 'rewrite' => false,
                 'query_var' => false,
+                'delete_with_user' => true,
                 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
         ) );
@@ -64 +66 @@
                 'query_var' => false,
                 'show_in_nav_menus' => false,
-                'supports' => array( 'comments' ),
+                'delete_with_user' => true,
+                'supports' => array( 'comments', 'author' ),
         ) );
 
@@ -81 +84 @@
                 'query_var' => false,
                 'can_export' => false,
+                'delete_with_user' => true,
+                'supports' => array( 'author' ),
         ) );
 
@@ -92 +97 @@
                 'hierarchical' => false,
                 'rewrite' => false,
+                'delete_with_user' => false,
                 'query_var' => false,
         ) );
@@ -934 +940 @@
  *     * If specified as a string, the query ?{query_var_string}={post_slug} will be valid.
  * - can_export - Allows this post type to be exported. Defaults to true.
+ * - delete_with_user - Whether to delete posts of this type when deleting a user.
+ *     * If true, posts of this type belonging to the user will be moved to trash when then user is deleted.
+ *     * If false, posts of this type belonging to the user will *not* be trashed or deleted.
+ *     * If not set (the default), posts are trashed if post_type_supports('author'). Otherwise posts are not trashed or deleted.
  * - _builtin - true if this post type is a native or "built-in" post_type. THIS IS FOR INTERNAL USE ONLY!
  * - _edit_link - URL segement to use for edit link of this post type. THIS IS FOR INTERNAL USE ONLY!
@@ -960 +970 @@
                 'can_export' => true,
                 'show_in_nav_menus' => null, 'show_in_menu' => null, 'show_in_admin_bar' => null,
+                'delete_with_user' => null,
         );
         $args = wp_parse_args($args, $defaults);