diff --git a/wp-admin/comment.php b/wp-admin/comment.php index f5eb56103d..37fc4fc98d 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -149,8 +149,9 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved $message = __('This comment is currently in the Trash.'); break; } - if ( $message ) - echo '

' . $message . '

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

' . $message . '

'; + } } ?>

@@ -186,7 +187,6 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved echo $post_link; if ( $comment->comment_parent ) { - $comment_url = esc_url( get_comment_link( $comment->comment_ID ) ); $parent = get_comment( $comment->comment_parent ); $parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); $name = get_comment_author( $parent->comment_ID ); @@ -200,7 +200,8 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved %2$s at %3$s' ), $comment_url, + printf( __( '%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' ) ) diff --git a/wp-includes/version.php b/wp-includes/version.php index fcb4e2e7ad..2131077f7b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31694'; +$wp_version = '4.2-alpha-31695'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.