WordPress.org
Get WordPress

Make WordPress Core

Changeset 9998


Ignore:
Timestamp:
12/01/2008 06:02:16 PM (18 years ago)
Author:
ryan
Message:

Feedback for post and page deletions. fixes #8415

Location:
trunk/wp-admin
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/edit-pages.php

    r9967 r9998  
    1818                        if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
    1919                                check_admin_referer('bulk-pages');
     20                                $deleted = 0;
    2021                                foreach( (array) $_GET['post'] as $post_id_del ) {
    2122                                        $post_del = & get_post($post_id_del);
    … …  
    3132                                                        wp_die( __('Error in deleting...') );
    3233                                        }
     34                                        $deleted++;
    3335                                }
    3436                        }
    … …  
    5961                $sendback = add_query_arg( $done, $sendback );
    6062        }
     63        if ( isset($deleted) )
     64                $sendback = add_query_arg('deleted', $deleted, $sendback);
    6165        wp_redirect($sendback);
    6266        exit();
    … …  
    103107<h2><?php echo wp_specialchars( $title ); ?></h2>
    104108
    105 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>
     109<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
    106110<div id="message" class="updated fade"><p>
    107 <?php if ( (int) $_GET['updated'] ) {
     111<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
    108112        printf( __ngettext( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
    109113        unset($_GET['updated']);
    110114}
    111115
    112 if ( (int) $_GET['skipped'] ) {
     116if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) {
    113117        printf( __ngettext( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) );
    114118        unset($_GET['skipped']);
    115119}
    116120
    117 if ( (int) $_GET['locked'] ) {
     121if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
    118122        printf( __ngettext( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
    119123        unset($_GET['locked']);
    120124}
    121 $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'), $_SERVER['REQUEST_URI'] );
     125
     126if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
     127        printf( __ngettext( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
     128        unset($_GET['deleted']);
     129}
     130$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
    122131?>
    123132</p></div>

  • trunk/wp-admin/edit.php

    r9914 r9998  
    2626                        if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) {
    2727                                check_admin_referer('bulk-posts');
     28                                $deleted = 0;
    2829                                foreach( (array) $_GET['post'] as $post_id_del ) {
    2930                                        $post_del = & get_post($post_id_del);
    … …  
    3940                                                        wp_die( __('Error in deleting...') );
    4041                                        }
     42                                        $deleted++;
    4143                                }
    4244                        }
    … …  
    6769                $sendback = add_query_arg( $done, $sendback );
    6870        }
     71        if ( isset($deleted) )
     72                $sendback = add_query_arg('deleted', $deleted, $sendback);
    6973        wp_redirect($sendback);
    7074        exit();
    … …  
    101105endif; ?>
    102106
    103 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>
     107<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
    104108<div id="message" class="updated fade"><p>
    105 <?php if ( (int) $_GET['updated'] ) {
     109<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) {
    106110        printf( __ngettext( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
    107111        unset($_GET['updated']);
    108112}
    109113
    110 if ( (int) $_GET['skipped'] )
     114if ( isset($_GET['skipped']) && (int) $_GET['skipped'] )
    111115        unset($_GET['skipped']);
    112116
    113 if ( (int) $_GET['locked'] ) {
     117if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
    114118        printf( __ngettext( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
    115119        unset($_GET['locked']);
    116 }
    117 $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated'), $_SERVER['REQUEST_URI'] );
     120}
     121
     122if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
     123        printf( __ngettext( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
     124        unset($_GET['deleted']);
     125}
     126
     127$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
    118128?>
    119129</p></div>

  • trunk/wp-admin/page.php

    r9996 r9998  
    171171
    172172        $sendback = wp_get_referer();
    173         if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
     173        if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('edit-pages.php?deleted=1');
    174174        elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
     175        else $sendback = add_query_arg('deleted', 1, $sendback);
    175176        wp_redirect($sendback);
    176177        exit();

  • trunk/wp-admin/post.php

    r9779 r9998  
    212212
    213213        $sendback = wp_get_referer();
    214         if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php');
     214        if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?deleted=1');
    215215        elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
     216        else $sendback = add_query_arg('deleted', 1, $sendback);
    216217        wp_redirect($sendback);
    217218        exit();
Note: See TracChangeset for help on using the changeset viewer.