X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..refs/heads/pristine:/wp-admin/comment.php diff --git a/wp-admin/comment.php b/wp-admin/comment.php index d4d37ee2..c2eca11e 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -12,6 +12,10 @@ 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
' . __( 'For more information:' ) . '
' . - '' . __( 'Documentation on Comments' ) . '
' . - '' . __( 'Support Forums' ) . '
' + '' . __( 'Documentation on Comments' ) . '
' . + '' . __( 'Support Forums' ) . '
' ); wp_enqueue_script('comment'); @@ -65,10 +58,10 @@ case 'editcomment' : $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.') ); + comment_footer_die( __('Sorry, you are not allowed to edit this comment.') ); 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.') ); @@ -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(); } @@ -111,21 +104,19 @@ case 'spam' : $nonce_action .= $comment_id; ?> -' . $message . '
' . $message . '
+
- | 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 . '' + ); + } + ?> + |