X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7688c6ba71852cd89123b62b2d57683535e4702a..5d244c8fd9a27c9f89dd08da2af6fbc67d4fce63:/wp-admin/comment.php diff --git a/wp-admin/comment.php b/wp-admin/comment.php index eee6a12f..1c46b0a9 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -1,213 +1,299 @@
$msg
"; + include( ABSPATH . 'wp-admin/admin-footer.php' ); + die; +} + +switch( $action ) { + +case 'editcomment' : $title = __('Edit Comment'); - require_once ('admin-header.php'); + get_current_screen()->add_help_tab( array( + 'id' => 'overview', + 'title' => __('Overview'), + 'content' => + '' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '
' . + '' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '
' + ) ); + + get_current_screen()->set_help_sidebar( + '' . __( 'For more information:' ) . '
' . + '' . __( 'Documentation on Comments' ) . '
' . + '' . __( 'Support Forums' ) . '
' + ); + + wp_enqueue_script('comment'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + + $comment_id = absint( $_GET['c'] ); - $comment = (int) $_GET['c']; + if ( !$comment = get_comment( $comment_id ) ) + comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'javascript:history.go(-1)') ); - if ( ! $comment = get_comment($comment) ) - wp_die(__('Oops, no comment with this ID.').sprintf(' '.__('Go back').'!', 'javascript:history.go(-1)')); + if ( !current_user_can( 'edit_comment', $comment_id ) ) + comment_footer_die( __('You are not allowed to edit this comment.') ); - if ( !current_user_can('edit_post', $comment->comment_post_ID) ) - wp_die( __('You are not allowed to edit comments on this post.') ); + if ( 'trash' == $comment->comment_approved ) + comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') ); - $comment = get_comment_to_edit($comment); + $comment = get_comment_to_edit( $comment_id ); - include('edit-form-comment.php'); + include( ABSPATH . 'wp-admin/edit-form-comment.php' ); break; -case 'cdc': -case 'mac': +case 'delete' : +case 'approve' : +case 'trash' : +case 'spam' : - require_once('./admin-header.php'); + $title = __('Moderate Comment'); - $comment = (int) $_GET['c']; - $formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment'; - $nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_'; - $nonce_action .= $comment; + $comment_id = absint( $_GET['c'] ); - if ( ! $comment = get_comment_to_edit($comment) ) - wp_die(__('Oops, no comment with this ID.').sprintf(' '.__('Go back').'!', 'edit.php')); + if ( !$comment = get_comment_to_edit( $comment_id ) ) { + wp_redirect( admin_url('edit-comments.php?error=1') ); + die(); + } - if ( !current_user_can('edit_post', $comment->comment_post_ID) ) - wp_die( 'cdc' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') ); -?> -'.__('Caution:').' '.__('You are about to mark the following comment as spam:'); ?>
- -'.__('Caution:').' '.__('You are about to delete the following comment:'); ?>
- -'.__('Caution:').' '.__('You are about to approve the following comment:'); ?>
- + // No need to re-approve/re-trash/re-spam a comment. + if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) { + wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) ); + die(); + } - + require_once( ABSPATH . 'wp-admin/admin-header.php' ); -