WordPress.org

Make WordPress Core

Changeset 12113


Ignore:
Timestamp:
10/27/09 03:46:31 (4 years ago)
Author:
azaozz
Message:

Fix trashing/untrashing comments when no JS, props caesarsgrunt, see #4529

Location:
trunk/wp-admin
Files:
2 edited

Legend:

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

    r11930 r12113  
    172172    $noredir = isset($_REQUEST['noredir']); 
    173173 
    174     if (!$comment = get_comment($comment_id)) 
     174    if ( !$comment = get_comment($comment_id) ) 
    175175        comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') ); 
    176     if (!current_user_can('edit_post', $comment->comment_post_ID )) 
     176    if ( !current_user_can('edit_post', $comment->comment_post_ID ) ) 
    177177        comment_footer_die( __('You are not allowed to edit comments on this post.') ); 
    178178 
    179     if ($action == 'trashcomment') { 
    180         check_admin_referer( 'trash-comment_' . $comment_id ); 
     179    check_admin_referer( 'delete-comment_' . $comment_id ); 
     180 
     181    if ( '' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php') ) 
     182        $redir = wp_get_referer(); 
     183    elseif ( '' != wp_get_original_referer() && false == $noredir ) 
     184        $redir = wp_get_original_referer(); 
     185    else 
     186        $redir = admin_url('edit-comments.php'); 
     187 
     188    if ( $action == 'trashcomment' ) { 
    181189        wp_trash_comment($comment_id); 
     190        $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir ); 
     191    } else { 
     192        wp_untrash_comment($comment_id); 
     193        $redir = add_query_arg( array('untrashed' => '1'), $redir ); 
    182194    } 
    183     else { 
    184         check_admin_referer( 'untrash-comment_' . $comment_id ); 
    185         wp_untrash_comment($comment_id); 
    186     } 
    187  
    188     if ('' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' )) 
    189         wp_redirect( wp_get_referer() ); 
    190     else if ('' != wp_get_original_referer() && false == $noredir) 
    191         wp_redirect(wp_get_original_referer()); 
    192     else 
    193         wp_redirect(admin_url('edit-comments.php')); 
     195 
     196    wp_redirect( $redir ); 
    194197 
    195198    die; 
     
    198201case 'unapprovecomment' : 
    199202    $comment_id = absint( $_GET['c'] ); 
    200     check_admin_referer( 'unapprove-comment_' . $comment_id ); 
     203    check_admin_referer( 'approve-comment_' . $comment_id ); 
    201204 
    202205    if ( isset( $_GET['noredir'] ) ) 
  • trunk/wp-admin/edit-form-comment.php

    r11841 r12113  
    6969<div id="major-publishing-actions"> 
    7070<div id="delete-action"> 
    71 <?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=trashcomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'trash-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "</a>\n"; ?> 
     71<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=trashcomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "</a>\n"; ?> 
    7272</div> 
    7373<div id="publishing-action"> 
Note: See TracChangeset for help on using the changeset viewer.