Changeset 4692

Show
Ignore:
Timestamp:
01/07/07 07:32:12 (1 year ago)
Author:
markjaquith
Message:

Avoid AYS for page deletion, and redirect to page list after deletion. fixes #3536

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.0/wp-admin/post.php

    r4656 r4692  
    139139case 'delete': 
    140140    $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']); 
    141     check_admin_referer('delete-post_' . $post_id); 
    142141 
    143142    $post = & get_post($post_id); 
    144      
     143 
     144    if ( $post->post_status == 'static') 
     145        check_admin_referer('delete-page_' . $post_id); 
     146    else 
     147        check_admin_referer('delete-post_' . $post_id); 
     148 
    145149    if ( !current_user_can('edit_post', $post_id) )  
    146150        die( __('You are not allowed to delete this post.') ); 
    …… 
    155159 
    156160    $sendback = wp_get_referer(); 
    157     if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php'; 
    158     elseif (strstr($sendback, 'attachments.php')) $sendback = get_settings('siteurl') .'/wp-admin/attachments.php'; 
    159     $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); 
     161    if ( $post->post_status = 'static' ) 
     162        $sendback = get_option('siteurl') . '/wp-admin/edit-pages.php'; 
     163    elseif ( strstr($sendback, 'post.php') ) 
     164        $sendback = get_option('siteurl') .'/wp-admin/post.php'; 
     165    elseif ( strstr($sendback, 'attachments.php') ) 
     166        $sendback = get_option('siteurl') .'/wp-admin/attachments.php'; 
    160167    wp_redirect($sendback); 
    161168    break;