Ticket #16956: 16956.2.diff

wp-includes/capabilities.php

@@ -1022 +1022 @@
                 }
 
                 $post_type = get_post_type_object( $post->post_type );
+                
+                if ( is_null( $post_type ) ) {
+                        $caps[] = 'do_not_allow';
+                        break;
+                }
 
                 if ( ! $post_type->map_meta_cap ) {
                         $caps[] = $post_type->cap->$cap;
@@ -1072 +1077 @@
                 }
 
                 $post_type = get_post_type_object( $post->post_type );
+                
+                if ( is_null( $post_type ) ) {
+                        $caps[] = 'do_not_allow';
+                        break;
+                }
 
                 if ( ! $post_type->map_meta_cap ) {
                         $caps[] = $post_type->cap->$cap;
@@ -1120 +1130 @@
                 }
 
                 $post_type = get_post_type_object( $post->post_type );
+                
+                if ( is_null( $post_type ) ) {
+                        $caps[] = 'do_not_allow';
+                        break;
+                }
 
                 if ( ! $post_type->map_meta_cap ) {
                         $caps[] = $post_type->cap->$cap;
@@ -1161 +1176 @@
         case 'add_post_meta':
                 $post = get_post( $args[0] );
                 $post_type_object = get_post_type_object( $post->post_type );
+
+                if ( is_null( $post_type_object ) ) {
+                        $caps[] = 'do_not_allow';
+                        break;
+                }
+                
                 $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );
 
                 $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
@@ -1178 +1199 @@
                 $post = get_post( $comment->comment_post_ID );
                 $post_type_object = get_post_type_object( $post->post_type );
 
+                if ( is_null( $post_type_object ) ) {
+                        $caps[] = 'do_not_allow';
+                        break;
+                }
+
                 $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );
                 break;
         case 'unfiltered_upload':