Ticket #12708: get_delete_post_link.2.diff

wp-includes/link-template.php

@@ -821 +821 @@
 /**
  * Retrieve delete posts link for post.
  *
- * Can be used within the WordPress loop or outside of it. Can be used with
- * pages, posts, attachments, and revisions.
+ * Can be used within the WordPress loop or outside of it, with any post type.
  *
  * @since 2.9.0
  *
  * @param int $id Optional. Post ID.
- * @param string $context Optional, default to display. How to write the '&', defaults to '&'.
+ * @param string $deprecated Not used.
+ * @param bool $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return string
  */
-function get_delete_post_link($id = 0, $context = 'display') {
+function get_delete_post_link($id = 0, $deprecated = '', $force_delete = false) {
+        if ( !empty( $deprecated ) )
+                _deprecated_argument( __FUNCTION__, '3.0' );
+
         if ( !$post = &get_post( $id ) )
                 return;
 
-        if ( 'display' == $context )
-                $action = 'action=trash&';
-        else
-                $action = 'action=trash&';
-
-        if ( 'display' == $context )
-                $action = '&action=trash';
-        else
-                $action = '&action=trash';
-
         $post_type_object = get_post_type_object( $post->post_type );
         if ( !$post_type_object )
                 return;
@@ -851 +844 @@
         if ( !current_user_can( $post_type_object->delete_cap, $post->ID ) )
                 return;
 
-        return apply_filters( 'get_delete_post_link', wp_nonce_url( admin_url( sprintf($post_type_object->_edit_link . $action, $post->ID) ),  "trash-{$post->post_type}_" . $post->ID), $post->ID, $context );
+        if ( $force_delete || !EMPTY_TRASH_DAYS )
+                $action = 'delete';
+        else
+                $action = 'trash';
+
+        $delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
+
+        return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-{$post->post_type}_{$post->ID}" ), $post->ID );
 }
 
 /**

wp-admin/includes/meta-boxes.php

@@ -194 +194 @@
 <div id="delete-action">
 <?php
 if ( current_user_can( "delete_post", $post->ID ) ) {
-        if ( !EMPTY_TRASH_DAYS ) {
-                $delete_url = wp_nonce_url( add_query_arg( array('action' => 'delete', 'post' => $post->ID), admin_url( 'post.php' ) ), "delete-${post_type}_{$post->ID}" );
+        if ( !EMPTY_TRASH_DAYS )
                 $delete_text = __('Delete Permanently');
-        } else {
-                $delete_url = wp_nonce_url( add_query_arg( array('action' => 'trash', 'post' => $post->ID), admin_url( 'post.php' ) ), "trash-${post_type}_{$post->ID}" );
+        else
                 $delete_text = __('Move to Trash');
-        } ?>
-<a class="submitdelete deletion" href="<?php echo $delete_url; ?>"><?php echo $delete_text; ?></a><?php
+        ?>
+<a class="submitdelete deletion" href="<?php echo get_delete_post_link($post->ID); ?>"><?php echo $delete_text; ?></a><?php
 } ?>
 </div>
 

wp-admin/includes/template.php

@@ -1359 +1359 @@
                                 elseif ( EMPTY_TRASH_DAYS )
                                         $actions['trash'] = "<a class='submitdelete' title='" . esc_attr(__('Move this post to the Trash')) . "' href='" . get_delete_post_link($post->ID) . "'>" . __('Trash') . "</a>";
                                 if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-                                        $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this post permanently')) . "' href='" . wp_nonce_url( admin_url( sprintf($post_type_object->_edit_link . '&amp;action=delete', $post->ID) ), 'delete-' . $post->post_type . '_' . $post->ID ) . "'>" . __('Delete Permanently') . "</a>";
+                                        $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) )