Ticket #13301: 13301.patch

wp-admin/includes/template.php

@@ -1359 +1359 @@
                                 if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
                                         $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this post permanently')) . "' href='" . get_delete_post_link($post->ID, '', true) . "'>" . __('Delete Permanently') . "</a>";
                         }
-                        if ( in_array($post->post_status, array('pending', 'draft')) ) {
-                                if ( current_user_can($post_type_object->edit_cap, $post->ID) )
-                                        $actions['view'] = '<a href="' . add_query_arg( 'preview', 'true', get_permalink($post->ID) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
-                        } elseif ( 'trash' != $post->post_status ) {
-                                $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+                        if ( $post_type_object->publicly_queryable ) {
+                                if ( in_array($post->post_status, array('pending', 'draft')) ) {
+                                        if ( current_user_can($post_type_object->edit_cap, $post->ID) )
+                                                $actions['view'] = '<a href="' . add_query_arg( 'preview', 'true', get_permalink($post->ID) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
+                                } elseif ( 'trash' != $post->post_status ) {
+                                        $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+                                }
                         }
                         $actions = apply_filters('post_row_actions', $actions, $post);
                         $action_count = count($actions);
@@ -1581 +1583 @@
                         if ( $post->post_status == 'trash' || !EMPTY_TRASH_DAYS )
                                 $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this page permanently')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=delete&amp;post=$page->ID", 'delete-' . $post->post_type . '_' . $page->ID) . "'>" . __('Delete Permanently') . "</a>";
                 }
-                if ( in_array($post->post_status, array('pending', 'draft')) ) {
-                        if ( current_user_can($post_type_object->edit_cap, $page->ID) )
-                                $actions['view'] = '<a href="' . add_query_arg( 'preview', 'true', get_permalink($page->ID) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
-                } elseif ( $post->post_status != 'trash' ) {
-                        $actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+                if ( $post_type_object->publicly_queryable ) {
+                        if ( in_array($post->post_status, array('pending', 'draft')) ) {
+                                if ( current_user_can($post_type_object->edit_cap, $page->ID) )
+                                        $actions['view'] = '<a href="' . add_query_arg( 'preview', 'true', get_permalink($page->ID) ) . '" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('Preview') . '</a>';
+                        } elseif ( $post->post_status != 'trash' ) {
+                                $actions['view'] = '<a href="' . get_permalink($page->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
+                        }
                 }
                 $actions = apply_filters('page_row_actions', $actions, $page);
                 $action_count = count($actions);