X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..e8f61417994be715a90671aa87f1cd70d8ba132a:/wp-admin/comment.php diff --git a/wp-admin/comment.php b/wp-admin/comment.php index de5483e2..ba700ba6 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -7,11 +7,15 @@ */ /** Load WordPress Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); $parent_file = 'edit-comments.php'; $submenu_file = 'edit-comments.php'; +/** + * @global string $action + */ +global $action; wp_reset_vars( array('action') ); if ( isset( $_POST['deletecomment'] ) ) @@ -29,17 +33,6 @@ if ( isset( $_GET['dt'] ) ) { $action = 'trash'; } -/** - * Display error message at bottom of comments. - * - * @param string $msg Error Message. Assumed to contain HTML and be sanitized. - */ -function comment_footer_die( $msg ) { - echo "

$msg

"; - include('./admin-footer.php'); - die; -} - switch( $action ) { case 'editcomment' : @@ -55,17 +48,17 @@ case 'editcomment' : get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Comments' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Comments' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); wp_enqueue_script('comment'); - require_once('./admin-header.php'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); $comment_id = absint( $_GET['c'] ); if ( !$comment = get_comment( $comment_id ) ) - comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'javascript:history.go(-1)') ); + comment_footer_die( __( 'Invalid comment 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.') ); @@ -75,7 +68,7 @@ case 'editcomment' : $comment = get_comment_to_edit( $comment_id ); - include('./edit-form-comment.php'); + include( ABSPATH . 'wp-admin/edit-form-comment.php' ); break; @@ -88,7 +81,7 @@ case 'spam' : $comment_id = absint( $_GET['c'] ); - if ( !$comment = get_comment_to_edit( $comment_id ) ) { + if ( ! $comment = get_comment( $comment_id ) ) { wp_redirect( admin_url('edit-comments.php?error=1') ); die(); } @@ -104,29 +97,26 @@ case 'spam' : die(); } - require_once('./admin-header.php'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); $formaction = $action . 'comment'; $nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_'; $nonce_action .= $comment_id; ?> -
- -
+
- -

+

comment_approved != '0' ) { // if not unapproved $message = __('This comment is currently in the Trash.'); break; } - if ( $message ) - echo '

' . $message . '

'; + if ( $message ) { + echo '

' . $message . '

'; + } } ?> -

+

- + - + -comment_author_email ) { ?> + - - + + -comment_author_url ) { ?> + - + - - + + -
comment_author; ?>
comment_author_email; ?>
comment_author_url; ?>
comment_content; ?> + comment_post_ID; + if ( current_user_can( 'edit_post', $post_id ) ) { + $post_link = ""; + $post_link .= esc_html( get_the_title( $post_id ) ) . ''; + } else { + $post_link = esc_html( get_the_title( $post_id ) ); + } + echo $post_link; + + if ( $comment->comment_parent ) { + $parent = get_comment( $comment->comment_parent ); + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + printf( + /* translators: %s: comment link */ + ' | ' . __( 'In reply to %s.' ), + '' . $name . '' + ); + } + ?> +
- -

- -
- - - - + + + + + +
+ comment_post_ID ) ) { + echo '' . $submitted . ''; + } else { + echo $submitted; + } + ?> +
+ +

comment_ID}" ); ?>">

+
+ + +

+ + +

+ - - - + + +
-
' . __('Go back') . '.', 'edit-comments.php') ); + comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' ' . __('Go back') . '.', 'edit-comments.php') ); if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) comment_footer_die( __('You are not allowed to edit comments on this post.') ); @@ -236,38 +269,37 @@ case 'unapprovecomment' : switch ( $action ) { case 'deletecomment' : - wp_delete_comment( $comment_id ); + wp_delete_comment( $comment ); $redir = add_query_arg( array('deleted' => '1'), $redir ); break; case 'trashcomment' : - wp_trash_comment($comment_id); + wp_trash_comment( $comment ); $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir ); break; case 'untrashcomment' : - wp_untrash_comment($comment_id); + wp_untrash_comment( $comment ); $redir = add_query_arg( array('untrashed' => '1'), $redir ); break; case 'spamcomment' : - wp_spam_comment($comment_id); + wp_spam_comment( $comment ); $redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir ); break; case 'unspamcomment' : - wp_unspam_comment($comment_id); + wp_unspam_comment( $comment ); $redir = add_query_arg( array('unspammed' => '1'), $redir ); break; case 'approvecomment' : - wp_set_comment_status( $comment_id, 'approve' ); + wp_set_comment_status( $comment, 'approve' ); $redir = add_query_arg( array( 'approved' => 1 ), $redir ); break; case 'unapprovecomment' : - wp_set_comment_status( $comment_id, 'hold' ); + wp_set_comment_status( $comment, 'hold' ); $redir = add_query_arg( array( 'unapproved' => 1 ), $redir ); break; } wp_redirect( $redir ); die; - break; case 'editedcomment' : @@ -279,16 +311,23 @@ case 'editedcomment' : edit_comment(); $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id; + + /** + * Filter the URI the user is redirected to after editing a comment in the admin. + * + * @since 2.1.0 + * + * @param string $location The URI the user will be redirected to. + * @param int $comment_id The ID of the comment being edited. + */ $location = apply_filters( 'comment_edit_redirect', $location, $comment_id ); wp_redirect( $location ); exit(); - break; default: wp_die( __('Unknown action.') ); - break; } // end switch -include('./admin-footer.php'); +include( ABSPATH . 'wp-admin/admin-footer.php' );