Ticket #21031: 21031.2.patch

wp-admin/includes/class-wp-comments-list-table.php

@@ -413 +413 @@
 
                         if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
                                 $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
-                                $actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
-                                $actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
+                                
+                                if ( !empty( $post ) ) {
+                                        $actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+                                        $actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
+                                }
                         }
 
                         $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
@@ -478 +481 @@
         function column_response( $comment ) {
                 global $post;
 
+                if ( empty( $post ) )
+                        return;
+
                 if ( isset( $this->pending_count[$post->ID] ) ) {
                         $pending_comments = $this->pending_count[$post->ID];
                 } else {

wp-includes/capabilities.php

@@ -961 +961 @@
         case 'delete_post':
         case 'delete_page':
                 $author_data = get_userdata( $user_id );
-                $post = get_post( $args[0] );
 
+                if ( ! $post = get_post( $args[0] ) )
+                        break;
+
                 if ( 'revision' == $post->post_type ) {
                         $post = get_post( $post->post_parent );
                 }
@@ -1011 +1013 @@
         case 'edit_post':
         case 'edit_page':
                 $author_data = get_userdata( $user_id );
-                $post = get_post( $args[0] );
 
+                if ( ! $post = get_post( $args[0] ) )
+                        break;
+
                 if ( 'revision' == $post->post_type ) {
                         $post = get_post( $post->post_parent );
                 }
@@ -1060 +1064 @@
         case 'read_post':
         case 'read_page':
                 $author_data = get_userdata( $user_id );
-                $post = get_post( $args[0] );
 
+                if ( ! $post = get_post( $args[0] ) )
+                        break;
+
                 if ( 'revision' == $post->post_type ) {
                         $post = get_post( $post->post_parent );
                 }
@@ -1099 +1105 @@
         case 'edit_post_meta':
         case 'delete_post_meta':
         case 'add_post_meta':
-                $post = get_post( $args[0] );
+
+                if ( ! $post = get_post( $args[0] ) )
+                        break;
+
                 $post_type_object = get_post_type_object( $post->post_type );
                 $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );
 
@@ -1115 +1124 @@
                 break;
         case 'edit_comment':
                 $comment = get_comment( $args[0] );
-                $post = get_post( $comment->comment_post_ID );
+
+                if ( ! $post = get_post( $comment->comment_post_ID ) )
+                        break;
+
                 $post_type_object = get_post_type_object( $post->post_type );
 
                 $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );