Changeset 13786 for trunk/wp-admin/includes/template.php

Timestamp:

03/21/2010 02:29:11 AM (16 years ago)

Author:

dd32

Message:

Use correct cap checks and nonces for custom post_type's

File:

• trunk/wp-admin/includes/template.php (modified) (3 diffs)

trunk/wp-admin/includes/template.php

@@ -864 +864 @@
                 $taxonomy = get_taxonomy( $taxonomy_name);
 
-                if( !$taxonomy->show_ui ) continue;
-
-                if( $taxonomy->hierarchical )
+                if ( !$taxonomy->show_ui )
+                        continue;
+
+                if ( $taxonomy->hierarchical )
                         $hierarchical_taxonomies[] = $taxonomy;
                 else
@@ -876 +877 @@
         $col_count = count($columns) - count($hidden);
         $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
-        // @todo use capability_type
         $can_publish = current_user_can($post_type_object->publish_cap);
         $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
@@ -1562 +1562 @@
                 if ( current_user_can($post_type_object->delete_cap, $page->ID) ) {
                         if ( $post->post_status == 'trash' )
-                                $actions['untrash'] = "<a title='" . esc_attr(__('Remove this page from the Trash')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=untrash&amp;post=$page->ID", 'untrash-page_' . $page->ID) . "'>" . __('Restore') . "</a>";
+                                $actions['untrash'] = "<a title='" . esc_attr(__('Remove this page from the Trash')) . "' href='" . wp_nonce_url("post.php?post_type=$post_type&amp;action=untrash&amp;post=$page->ID", 'untrash-' . $post->post_type . '_' . $page->ID) . "'>" . __('Restore') . "</a>";
                         elseif ( EMPTY_TRASH_DAYS )
                                 $actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this page to the Trash')) . "' href='" . get_delete_post_link($page->ID) . "'>" . __('Trash') . "</a>";
                         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-page_' . $page->ID) . "'>" . __('Delete Permanently') . "</a>";
+                                $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')) ) {