Changeset 13905 for trunk/wp-admin/includes/meta-boxes.php

Timestamp:

03/31/2010 08:13:04 PM (15 years ago)

Author:

markjaquith

Message:

Deletion link should always show

File:

• trunk/wp-admin/includes/meta-boxes.php (modified) (1 diff)

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

@@ -196 +196 @@
 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) ), "delete-${post_type}_{$post->ID}" );
+        $delete_url = wp_nonce_url( add_query_arg( array('action' => 'delete', 'post' => $post->ID), admin_url( 'post.php' ) ), "delete-${post_type}_{$post->ID}" );
         $delete_text = __('Delete Permanently');
     } else {
-        $delete_url = wp_nonce_url( add_query_arg( array('action' => 'trash', 'post' => $post->ID) ), "trash-${post_type}_{$post->ID}" );
+        $delete_url = wp_nonce_url( add_query_arg( array('action' => 'trash', 'post' => $post->ID), admin_url( 'post.php' ) ), "trash-${post_type}_{$post->ID}" );
         $delete_text = __('Move to Trash');
     } ?>
-<a class="submitdelete deletion<?php if ( 'edit' != $action ) { echo " hidden"; } ?>" href="<?php echo $delete_url; ?>"><?php echo $delete_text; ?></a><?php
+<a class="submitdelete deletion" href="<?php echo $delete_url; ?>"><?php echo $delete_text; ?></a><?php
 } ?>
 </div>