Changeset 14099 for trunk/wp-admin/includes/meta-boxes.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-admin/includes/meta-boxes.php (modified) (1 diff)

trunk/wp-admin/includes/meta-boxes.php

@@ -195 +195 @@
 <?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>