Changeset 34794

Timestamp:

10/03/2015 01:49:52 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Respect the force_delete parameter of get_delete_post_link().

Previously, it only worked if EMPTY_TRASH_DAYS was disabled.

Props johnbillion, chriscct7.
Fixes #26832.

File:

• trunk/src/wp-admin/post.php (modified) (1 diff)

trunk/src/wp-admin/post.php

@@ -255 +255 @@
         wp_die( __( 'You are not allowed to delete this item.' ) );
 
-    $force = ! EMPTY_TRASH_DAYS;
     if ( $post->post_type == 'attachment' ) {
-        $force = ( $force || ! MEDIA_TRASH );
+        $force = ( ! MEDIA_TRASH );
         if ( ! wp_delete_attachment( $post_id, $force ) )
             wp_die( __( 'Error in deleting.' ) );
     } else {
-        if ( ! wp_delete_post( $post_id, $force ) )
+        if ( ! wp_delete_post( $post_id, true ) )
             wp_die( __( 'Error in deleting.' ) );
     }