diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/edit-form-comment.php
--- a/wp/wp-admin/edit-form-comment.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/edit-form-comment.php	Mon Oct 14 18:28:13 2019 +0200
@@ -7,11 +7,12 @@
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}
 ?>
 <form name="post" action="comment.php" method="post" id="post">
-<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<?php wp_nonce_field( 'update-comment_' . $comment->comment_ID ); ?>
 <div class="wrap">
 <h1><?php _e( 'Edit Comment' ); ?></h1>
 
@@ -25,7 +26,7 @@
 <?php
 if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_ID > 0 ) :
 	$comment_link = get_comment_link( $comment );
-?>
+	?>
 <div class="inside">
 	<div id="comment-link-box">
 		<strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
@@ -39,29 +40,29 @@
 <?php endif; ?>
 <div id="namediv" class="stuffbox">
 <div class="inside">
+<h2 class="edit-comment-author"><?php _e( 'Author' ); ?></h2>
 <fieldset>
-<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
-<table class="form-table editcomment">
+<legend class="screen-reader-text"><?php _e( 'Comment Author' ); ?></legend>
+<table class="form-table editcomment" role="presentation">
 <tbody>
 <tr>
-	<td class="first"><label for="name"><?php _e( 'Name:' ); ?></label></td>
+	<td class="first"><label for="name"><?php _e( 'Name' ); ?></label></td>
 	<td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
 </tr>
 <tr>
-	<td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
+	<td class="first"><label for="email"><?php _e( 'Email' ); ?></label></td>
 	<td>
 		<input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
 	</td>
 </tr>
 <tr>
-	<td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
+	<td class="first"><label for="newcomment_author_url"><?php _e( 'URL' ); ?></label></td>
 	<td>
-		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" />
+		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr( $comment->comment_author_url ); ?>" />
 	</td>
 </tr>
 </tbody>
 </table>
-<br />
 </fieldset>
 </div>
 </div>
@@ -70,14 +71,23 @@
 <?php
 	echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-	wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+	wp_editor(
+		$comment->comment_content,
+		'content',
+		array(
+			'media_buttons' => false,
+			'tinymce'       => false,
+			'quicktags'     => $quicktags_settings,
+		)
+	);
+	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+	?>
 </div>
 </div><!-- /post-body-content -->
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h2><?php _e( 'Status' ) ?></h2>
+<h2><?php _e( 'Status' ); ?></h2>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
@@ -96,13 +106,15 @@
 /* translators: Publish box date format, see https://secure.php.net/date */
 $datef = __( 'M j, Y @ H:i' );
 ?>
-<span id="timestamp"><?php
+<span id="timestamp">
+<?php
 printf(
 	/* translators: %s: comment date */
 	__( 'Submitted on: %s' ),
 	'<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
 );
-?></span>
+?>
+</span>
 <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
 <fieldset id='timestampdiv' class='hide-if-js'>
 <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
@@ -113,7 +125,7 @@
 <?php
 $post_id = $comment->comment_post_ID;
 if ( current_user_can( 'edit_post', $post_id ) ) {
-	$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+	$post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
 	$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
 } else {
 	$post_link = esc_html( get_the_title( $post_id ) );
@@ -121,29 +133,35 @@
 ?>
 
 <div class="misc-pub-section misc-pub-response-to">
-	<?php printf(
+	<?php
+	printf(
 		/* translators: %s: post link */
 		__( 'In response to: %s' ),
 		'<b>' . $post_link . '</b>'
-	); ?>
+	);
+	?>
 </div>
 
 <?php
 if ( $comment->comment_parent ) :
-	$parent      = get_comment( $comment->comment_parent );
+	$parent = get_comment( $comment->comment_parent );
 	if ( $parent ) :
 		$parent_link = esc_url( get_comment_link( $parent ) );
 		$name        = get_comment_author( $parent );
-	?>
+		?>
 	<div class="misc-pub-section misc-pub-reply-to">
-		<?php printf(
+		<?php
+		printf(
 			/* translators: %s: comment link */
 			__( 'In reply to: %s' ),
 			'<b><a href="' . $parent_link . '">' . $name . '</a></b>'
-		); ?>
+		);
+		?>
 	</div>
-<?php endif;
-endif; ?>
+		<?php
+endif;
+endif;
+?>
 
 <?php
 	/**
@@ -154,7 +172,7 @@
 	 * @param string $html    Output HTML to display miscellaneous action.
 	 * @param object $comment Current comment object.
 	 */
-	 echo apply_filters( 'edit_comment_misc_actions', '', $comment );
+	echo apply_filters( 'edit_comment_misc_actions', '', $comment );
 ?>
 
 </div> <!-- misc actions -->
@@ -163,7 +181,7 @@
 
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "</a>\n"; ?>
 </div>
 <div id="publishing-action">
 <?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?>
@@ -177,7 +195,7 @@
 
 <div id="postbox-container-2" class="postbox-container">
 <?php
-/** This action is documented in wp-admin/edit-form-advanced.php */
+/** This action is documented in wp-admin/includes/meta-boxes.php */
 do_action( 'add_meta_boxes', 'comment', $comment );
 
 /**
@@ -189,16 +207,16 @@
  */
 do_action( 'add_meta_boxes_comment', $comment );
 
-do_meta_boxes(null, 'normal', $comment);
+do_meta_boxes( null, 'normal', $comment );
 
 $referer = wp_get_referer();
 ?>
 </div>
 
-<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
-<input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
+<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+<input type="hidden" name="p" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
-<?php wp_original_referer_field(true, 'previous'); ?>
+<?php wp_original_referer_field( true, 'previous' ); ?>
 <input type="hidden" name="noredir" value="1" />
 
 </div><!-- /post-body -->
@@ -210,4 +228,5 @@
 <script type="text/javascript">
 try{document.post.name.focus();}catch(e){}
 </script>
-<?php endif;
+	<?php
+endif;