diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/edit-form-comment.php
--- a/wp/wp-admin/edit-form-comment.php	Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/edit-form-comment.php	Mon Oct 14 17:39:30 2019 +0200
@@ -13,7 +13,7 @@
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
-<h2><?php _e('Edit Comment'); ?></h2>
+<h1><?php _e( 'Edit Comment' ); ?></h1>
 
 <div id="poststuff">
 <input type="hidden" name="action" value="editedcomment" />
@@ -21,48 +21,54 @@
 <input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
 
 <div id="post-body" class="metabox-holder columns-2">
-<div id="post-body-content" class="edit-form-section">
+<div id="post-body-content" class="edit-form-section edit-comment-section">
+<?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>
+		<span id="sample-permalink">
+			<a href="<?php echo esc_url( $comment_link ); ?>">
+				<?php echo esc_html( $comment_link ); ?>
+			</a>
+		</span>
+	</div>
+</div>
+<?php endif; ?>
 <div id="namediv" class="stuffbox">
-<h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
 <div class="inside">
+<fieldset>
+<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
 <table class="form-table editcomment">
 <tbody>
 <tr>
-	<td class="first"><?php _e( 'Name:' ); ?></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">
-	<?php
-		if ( $comment->comment_author_email ) {
-			printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
-		} else {
-			_e( 'E-mail:' );
-		}
-?></td>
-	<td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" /></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">
-	<?php
-		if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
-			$link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
-			$author = get_comment_author( $comment->comment_ID );
-			/** This filter is documented in wp-includes/comment-template.php */
-			printf( __( 'URL (%s):' ), apply_filters( 'get_comment_author_link', $link, $author, $comment->comment_ID ) );
-		} else {
-			_e( 'URL:' );
-		} ?></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); ?>" /></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); ?>" />
+	</td>
 </tr>
 </tbody>
 </table>
 <br />
+</fieldset>
 </div>
 </div>
 
 <div id="postdiv" class="postarea">
 <?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 ); ?>
@@ -71,41 +77,37 @@
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h3><span class="hndle"><?php _e('Status') ?></span></h3>
+<h2><?php _e( 'Status' ) ?></h2>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
 
-<div id="minor-publishing-actions">
-<div id="preview-action">
-<a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a>
-</div>
-<div class="clear"></div>
-</div>
-
 <div id="misc-publishing-actions">
 
-<div class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">
-<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ _ex('Approved', 'adjective') ?></label><br />
-<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ _ex('Pending', 'adjective') ?></label><br />
-<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ _ex('Spam', 'adjective'); ?></label>
-</div>
-
-<?php if ( $ip = get_comment_author_IP() ) : ?>
-<div class="misc-pub-section misc-pub-comment-author-ip">
-	<?php _e( 'IP address:' ); ?> <strong><a href="<?php echo esc_url( sprintf( 'http://whois.arin.net/rest/ip/%s', $ip ) ); ?>"><?php echo esc_html( $ip ); ?></a></strong>
-</div>
-<?php endif; ?>
+<fieldset class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">
+<legend class="screen-reader-text"><?php _e( 'Comment status' ); ?></legend>
+<label><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _ex( 'Approved', 'comment status' ); ?></label><br />
+<label><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _ex( 'Pending', 'comment status' ); ?></label><br />
+<label><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
+</fieldset>
 
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php
-/* translators: Publish box date format, see http://php.net/date */
+/* translators: Publish box date format, see https://secure.php.net/date */
 $datef = __( 'M j, Y @ H:i' );
-$stamp = __('Submitted on: <b>%1$s</b>');
-$date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 ?>
-<span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a>
-<div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0); ?></div>
+<span id="timestamp"><?php
+printf(
+	/* translators: %s: comment date */
+	__( 'Submitted on: %s' ),
+	'<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
+);
+?></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>
+<?php touch_time( ( 'editcomment' === $action ), 0 ); ?>
+</fieldset>
 </div>
 
 <?php
@@ -119,19 +121,41 @@
 ?>
 
 <div class="misc-pub-section misc-pub-response-to">
-	<?php printf( __( 'In response to: <b>%s</b>' ), $post_link ); ?>
+	<?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_link = esc_url( get_comment_link( $comment->comment_parent ) );
-	$name        = get_comment_author( $parent->comment_ID );
+	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(
+			/* translators: %s: comment link */
+			__( 'In reply to: %s' ),
+			'<b><a href="' . $parent_link . '">' . $name . '</a></b>'
+		); ?>
+	</div>
+<?php endif;
+endif; ?>
+
+<?php
+	/**
+	 * Filters miscellaneous actions for the edit comment form sidebar.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param string $html    Output HTML to display miscellaneous action.
+	 * @param object $comment Current comment object.
+	 */
+	 echo apply_filters( 'edit_comment_misc_actions', '', $comment );
 ?>
-<div class="misc-pub-section misc-pub-reply-to">
-	<?php printf( __( 'In reply to: <b><a href="%1$s">%2$s</a></b>' ), $parent_link, $name ); ?>
-</div>
-<?php endif; ?>
 
 </div> <!-- misc actions -->
 <div class="clear"></div>
@@ -142,7 +166,7 @@
 <?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', 'save', false ); ?>
+<?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?>
 </div>
 <div class="clear"></div>
 </div>
@@ -161,7 +185,7 @@
  *
  * @since 3.0.0
  *
- * @param object $comment Comment object.
+ * @param WP_Comment $comment Comment object.
  */
 do_action( 'add_meta_boxes_comment', $comment );