diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/comment.php --- a/wp/wp-admin/comment.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/comment.php Mon Oct 14 17:39:30 2019 +0200 @@ -12,6 +12,9 @@ $parent_file = 'edit-comments.php'; $submenu_file = 'edit-comments.php'; +/** + * @global string $action + */ global $action; wp_reset_vars( array('action') ); @@ -30,17 +33,6 @@ $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( ABSPATH . 'wp-admin/admin-footer.php' ); - die; -} - switch( $action ) { case 'editcomment' : @@ -56,8 +48,8 @@ get_current_screen()->set_help_sidebar( '

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

' . - '

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

' . - '

' . __( 'Support Forums' ) . '

' + '

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

' . + '

' . __( 'Support Forums' ) . '

' ); wp_enqueue_script('comment'); @@ -66,10 +58,10 @@ $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.') ); @@ -89,7 +81,7 @@ $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(); } @@ -114,13 +106,13 @@ ?>
-

+

' . $message . '

'; + echo '

' . $message . '

'; } } ?> -

+

- + -comment_author_email ) { ?> + - - + + -comment_author_url ) { ?> + - + - + @@ -199,19 +195,26 @@ - +
comment_author; ?>
comment_author_email; ?>
comment_author_url; ?>
comment_post_ID; @@ -188,9 +180,13 @@ if ( $comment->comment_parent ) { $parent = get_comment( $comment->comment_parent ); - $parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); - $name = get_comment_author( $parent->comment_ID ); - printf( ' | ' . __( 'In reply to %2$s.' ), $parent_link, $name ); + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + printf( + /* translators: %s: comment link */ + ' | ' . __( 'In reply to %s.' ), + '' . $name . '' + ); } ?> %2$s at %3$s' ), - esc_url( get_comment_link( $comment->comment_ID ) ), - /* translators: comment date format. See http://php.net/date */ - get_comment_date( __( 'Y/m/d' ) ), - get_comment_date( get_option( 'time_format' ) ) + /* translators: 1: comment date, 2: comment time */ + $submitted = sprintf( __( '%1$s at %2$s' ), + /* translators: comment date format. See https://secure.php.net/date */ + get_comment_date( __( 'Y/m/d' ), $comment ), + get_comment_date( __( 'g:i a' ), $comment ) ); + if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) { + echo '' . $submitted . ''; + } else { + echo $submitted; + } ?>
comment_content; ?> + +

comment_ID}" ); ?>">

+
@@ -219,7 +222,7 @@

- +

@@ -249,9 +252,9 @@ $noredir = isset($_REQUEST['noredir']); if ( !$comment = get_comment($comment_id) ) - comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('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.') ); + comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') ); if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') ) $redir = wp_get_referer(); @@ -266,31 +269,31 @@ 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; } @@ -310,7 +313,7 @@ $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. + * Filters the URI the user is redirected to after editing a comment in the admin. * * @since 2.1.0 *