Make WordPress Core


Ignore:
Timestamp:
12/01/2009 11:28:20 PM (17 years ago)
Author:
azaozz
Message:

Fix multiple confirmation messages when restoring posts and pages from the trash, props caesarsgrunt, see #4529

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/page.php

    r12260 r12312  
    7373        $action = 'preview';
    7474
     75$sendback = wp_get_referer();
     76if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false )
     77        $sendback = admin_url('edit-pages.php');
     78else
     79        $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
     80
    7581switch($action) {
    7682case 'post':
    … …  
    157163                wp_die( __('Error in moving to trash...') );
    158164
    159         $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
    160         if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false )
    161                 $sendback = admin_url('edit-pages.php?trashed=1&ids='.$post_id);
    162         else
    163                 $sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback );
    164 
    165         wp_redirect($sendback);
     165        wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
    166166        exit();
    167167        break;
    … …  
    179179                wp_die( __('Error in restoring from trash...') );
    180180
    181         $sendback = wp_get_referer();
    182         if ( strpos($sendback, 'page.php') !== false )
    183                 $sendback = admin_url('edit-pages.php?untrashed=1');
    184         else
    185                 $sendback = add_query_arg('untrashed', 1, $sendback);
    186 
    187         wp_redirect($sendback);
     181        wp_redirect( add_query_arg('untrashed', 1, $sendback) );
    188182        exit();
    189183        break;
    … …  
    206200        }
    207201
    208         $sendback = wp_get_referer();
    209         if ( strpos($sendback, 'page.php') !== false )
    210                 $sendback = admin_url('edit-pages.php?deleted=1');
    211         else
    212                 $sendback = add_query_arg('deleted', 1, $sendback);
    213 
    214         wp_redirect($sendback);
     202        wp_redirect( add_query_arg('deleted', 1, $sendback) );
    215203        exit();
    216204        break;
Note: See TracChangeset for help on using the changeset viewer.