diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/edit-tag-form.php
--- a/wp/wp-admin/edit-tag-form.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/edit-tag-form.php	Mon Oct 14 18:28:13 2019 +0200
@@ -14,12 +14,12 @@
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
 	/**
- 	 * Fires before the Edit Category form.
+	 * Fires before the Edit Category form.
 	 *
 	 * @since 2.1.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
 	 *
-	 * @param object $tag Current category term object.
+	 * @param WP_Term $tag Current category term object.
 	 */
 	do_action( 'edit_category_form_pre', $tag );
 } elseif ( 'link_category' == $taxonomy ) {
@@ -29,7 +29,7 @@
 	 * @since 2.3.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
 	 *
-	 * @param object $tag Current link category term object.
+	 * @param WP_Term $tag Current link category term object.
 	 */
 	do_action( 'edit_link_category_form_pre', $tag );
 } else {
@@ -39,7 +39,7 @@
 	 * @since 2.5.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
 	 *
-	 * @param object $tag Current tag term object.
+	 * @param WP_Term $tag Current tag term object.
 	 */
 	do_action( 'edit_tag_form_pre', $tag );
 }
@@ -62,28 +62,35 @@
  *
  * @since 3.0.0
  *
- * @param object $tag      Current taxonomy term object.
- * @param string $taxonomy Current $taxonomy slug.
+ * @param WP_Term $tag      Current taxonomy term object.
+ * @param string  $taxonomy Current $taxonomy slug.
  */
 do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 
 <div class="wrap">
 <h1><?php echo $tax->labels->edit_item; ?></h1>
 
-<?php if ( $message ) : ?>
-<div id="message" class="updated">
+<?php
+$class = ( isset( $msg ) && 5 === $msg ) ? 'error' : 'success';
+
+if ( $message ) {
+	?>
+<div id="message" class="notice notice-<?php echo $class; ?>">
 	<p><strong><?php echo $message; ?></strong></p>
 	<?php if ( $wp_http_referer ) { ?>
-	<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>"><?php
-		echo esc_html( $tax->labels->back_to_items );
-	?></a></p>
+	<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>">
+		<?php echo esc_html( $tax->labels->back_to_items ); ?>
+	</a></p>
 	<?php } ?>
 </div>
-<?php endif; ?>
+	<?php
+}
+?>
 
 <div id="ajax-response"></div>
 
-<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"<?php
+<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"
+<?php
 /**
  * Fires inside the Edit Term form tag.
  *
@@ -92,10 +99,11 @@
  * @since 3.7.0
  */
 do_action( "{$taxonomy}_term_edit_form_tag" );
-?>>
+?>
+>
 <input type="hidden" name="action" value="editedtag"/>
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ) ?>"/>
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ) ?>"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ); ?>"/>
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>"/>
 <?php
 wp_original_referer_field( true, 'previous' );
 wp_nonce_field( 'update-tag_' . $tag_ID );
@@ -109,18 +117,23 @@
  *
  * @since 4.5.0
  *
- * @param object $tag      Current taxonomy term object.
- * @param string $taxonomy Current $taxonomy slug.
+ * @param WP_Term $tag      Current taxonomy term object.
+ * @param string  $taxonomy Current $taxonomy slug.
  */
 do_action( "{$taxonomy}_term_edit_form_top", $tag, $taxonomy );
+
+$tag_name_value = '';
+if ( isset( $tag->name ) ) {
+	$tag_name_value = esc_attr( $tag->name );
+}
 ?>
-	<table class="form-table">
+	<table class="form-table" role="presentation">
 		<tr class="form-field form-required term-name-wrap">
 			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
-			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
+			<td><input name="name" id="name" type="text" value="<?php echo $tag_name_value; ?>" size="40" aria-required="true" />
+			<p class="description"><?php _e( 'The name is how it appears on your site.' ); ?></p></td>
 		</tr>
-<?php if ( !global_terms_enabled() ) { ?>
+<?php if ( ! global_terms_enabled() ) { ?>
 		<tr class="form-field term-slug-wrap">
 			<th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
 			<?php
@@ -133,17 +146,17 @@
 			 * @since 2.6.0
 			 * @since 4.4.0 The `$tag` parameter was added.
 			 *
-			 * @param string         $slug The editable slug. Will be either a term slug or post URI depending
-			 *                             upon the context in which it is evaluated.
-			 * @param object|WP_Post $tag  Term or WP_Post object.
+			 * @param string          $slug The editable slug. Will be either a term slug or post URI depending
+			 *                              upon the context in which it is evaluated.
+			 * @param WP_Term|WP_Post $tag  Term or WP_Post object.
 			 */
 			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';
 			?>
 			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
-			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
+			<p class="description"><?php _e( 'The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ); ?></p></td>
 		</tr>
 <?php } ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
 		<tr class="form-field term-parent-wrap">
 			<th scope="row"><label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label></th>
 			<td>
@@ -162,7 +175,8 @@
 
 				/** This filter is documented in wp-admin/edit-tags.php */
 				$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
-				wp_dropdown_categories( $dropdown_args ); ?>
+				wp_dropdown_categories( $dropdown_args );
+				?>
 				<?php if ( 'category' == $taxonomy ) : ?>
 					<p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
 				<?php else : ?>
@@ -174,7 +188,7 @@
 		<tr class="form-field term-description-wrap">
 			<th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
 			<td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
-			<p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
+			<p class="description"><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p></td>
 		</tr>
 		<?php
 		// Back compat hooks
@@ -185,7 +199,7 @@
 			 * @since 2.9.0
 			 * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
 			 *
-			 * @param object $tag Current category term object.
+			 * @param WP_Term $tag Current category term object.
 			 */
 			do_action( 'edit_category_form_fields', $tag );
 		} elseif ( 'link_category' == $taxonomy ) {
@@ -195,7 +209,7 @@
 			 * @since 2.9.0
 			 * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
 			 *
-			 * @param object $tag Current link category term object.
+			 * @param WP_Term $tag Current link category term object.
 			 */
 			do_action( 'edit_link_category_form_fields', $tag );
 		} else {
@@ -205,7 +219,7 @@
 			 * @since 2.9.0
 			 * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
 			 *
-			 * @param object $tag Current tag term object.
+			 * @param WP_Term $tag Current tag term object.
 			 */
 			do_action( 'edit_tag_form_fields', $tag );
 		}
@@ -217,8 +231,8 @@
 		 *
 		 * @since 3.0.0
 		 *
-		 * @param object $tag      Current taxonomy term object.
-		 * @param string $taxonomy Current taxonomy slug.
+		 * @param WP_Term $tag      Current taxonomy term object.
+		 * @param string  $taxonomy Current taxonomy slug.
 		 */
 		do_action( "{$taxonomy}_edit_form_fields", $tag, $taxonomy );
 		?>
@@ -238,7 +252,7 @@
 	 * @since 2.5.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_edit_form instead.
 	 *
-	 * @param object $tag Current taxonomy term object.
+	 * @param WP_Term $tag Current taxonomy term object.
 	 */
 	do_action( 'edit_tag_form', $tag );
 }
@@ -249,8 +263,8 @@
  *
  * @since 3.0.0
  *
- * @param object $tag      Current taxonomy term object.
- * @param string $taxonomy Current taxonomy slug.
+ * @param WP_Term $tag      Current taxonomy term object.
+ * @param string  $taxonomy Current taxonomy slug.
  */
 do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 ?>
@@ -261,7 +275,7 @@
 
 	<?php if ( current_user_can( 'delete_term', $tag->term_id ) ) : ?>
 		<span id="delete-link">
-			<a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"><?php _e( 'Delete' ); ?></a>
+			<a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ); ?>"><?php _e( 'Delete' ); ?></a>
 		</span>
 	<?php endif; ?>
 
@@ -274,4 +288,5 @@
 <script type="text/javascript">
 try{document.forms.edittag.name.focus();}catch(e){}
 </script>
-<?php endif;
+	<?php
+endif;