Changeset 14099 for trunk/wp-includes/link-template.php

Timestamp:

04/16/2010 02:29:10 AM (15 years ago)

Author:

nacin

Message:

Add $force_delete to get_delete_post_link(). Remove unnecessary argument. props scribu, fixes #12708

File:

• trunk/wp-includes/link-template.php (modified) (2 diffs)

trunk/wp-includes/link-template.php

@@ -822 +822 @@
  * 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 '&'.
- * @return string
- */
-function get_delete_post_link($id = 0, $context = 'display') {
+ * @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, $deprecated = '', $force_delete = false ) {
+    if ( ! empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '3.0.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 );
@@ -852 +845 @@
         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 );
+    $action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : '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, $force_delete );
 }