diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/menu-header.php
--- a/wp/wp-admin/menu-header.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/menu-header.php	Mon Oct 14 18:28:13 2019 +0200
@@ -11,10 +11,10 @@
  *
  * @global string $self
  */
-$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
-$self = preg_replace('|^.*/wp-admin/|i', '', $self);
-$self = preg_replace('|^.*/plugins/|i', '', $self);
-$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
+$self = preg_replace( '|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF'] );
+$self = preg_replace( '|^.*/wp-admin/|i', '', $self );
+$self = preg_replace( '|^.*/plugins/|i', '', $self );
+$self = preg_replace( '|^.*/mu-plugins/|i', '', $self );
 
 /**
  * For when admin-header is included from within a function.
@@ -72,41 +72,43 @@
 	// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
 	foreach ( $menu as $key => $item ) {
 		$admin_is_parent = false;
-		$class = array();
+		$class           = array();
 		$aria_attributes = '';
-		$aria_hidden = '';
-		$is_separator = false;
+		$aria_hidden     = '';
+		$is_separator    = false;
 
 		if ( $first ) {
 			$class[] = 'wp-first-item';
-			$first = false;
+			$first   = false;
 		}
 
 		$submenu_items = array();
-		if ( ! empty( $submenu[$item[2]] ) ) {
-			$class[] = 'wp-has-submenu';
-			$submenu_items = $submenu[$item[2]];
+		if ( ! empty( $submenu[ $item[2] ] ) ) {
+			$class[]       = 'wp-has-submenu';
+			$submenu_items = $submenu[ $item[2] ];
 		}
 
-		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
+		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty( $typenow ) && $self == $item[2] ) ) {
 			if ( ! empty( $submenu_items ) ) {
 				$class[] = 'wp-has-current-submenu wp-menu-open';
 			} else {
-				$class[] = 'current';
+				$class[]          = 'current';
 				$aria_attributes .= 'aria-current="page"';
 			}
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
+			if ( ! empty( $submenu_items ) ) {
 				$aria_attributes .= 'aria-haspopup="true"';
+			}
 		}
 
-		if ( ! empty( $item[4] ) )
+		if ( ! empty( $item[4] ) ) {
 			$class[] = esc_attr( $item[4] );
+		}
 
-		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
-		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
-		$img = $img_style = '';
+		$class     = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+		$id        = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$img       = $img_style = '';
 		$img_class = ' dashicons-before';
 
 		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
@@ -125,11 +127,11 @@
 			if ( 'none' === $item[6] || 'div' === $item[6] ) {
 				$img = '<br />';
 			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
-				$img = '<br />';
+				$img       = '<br />';
 				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
 				$img_class = ' svg';
 			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
-				$img = '<br />';
+				$img       = '<br />';
 				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
 			}
 		}
@@ -137,7 +139,7 @@
 
 		$title = wptexturize( $item[0] );
 
-		// hide separators from screen readers
+		// Hide separators from screen readers.
 		if ( $is_separator ) {
 			$aria_hidden = ' aria-hidden="true"';
 		}
@@ -148,10 +150,11 @@
 			echo '<div class="separator"></div>';
 		} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
 			$submenu_items = array_values( $submenu_items );  // Re-index.
-			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
-			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+			$menu_hook     = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+			$menu_file     = $submenu_items[0][2];
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
 				$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
@@ -161,8 +164,9 @@
 		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
 			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
 				$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
@@ -179,36 +183,38 @@
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
 			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
+				if ( ! current_user_can( $sub_item[1] ) ) {
 					continue;
+				}
 
-				$class = array();
+				$class           = array();
 				$aria_attributes = '';
 				if ( $first ) {
 					$class[] = 'wp-first-item';
-					$first = false;
+					$first   = false;
 				}
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
 					$menu_file = substr( $menu_file, 0, $pos );
+				}
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
 				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
 
 				if ( isset( $submenu_file ) ) {
 					if ( $submenu_file == $sub_item[2] ) {
-						$class[] = 'current';
+						$class[]          = 'current';
 						$aria_attributes .= ' aria-current="page"';
 					}
-				// If plugin_page is set the parent must either match the current page or not physically exist.
-				// This allows plugin pages with the same hook to exist under different parents.
+					// If plugin_page is set the parent must either match the current page or not physically exist.
+					// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
 					( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists( $menu_file ) === false ) )
 				) {
-					$class[] = 'current';
+					$class[]          = 'current';
 					$aria_attributes .= ' aria-current="page"';
 				}
 
@@ -218,19 +224,21 @@
 
 				$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 
-				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
-				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
-					$sub_file = substr($sub_file, 0, $pos);
+				$menu_hook = get_plugin_page_hook( $sub_item[2], $item[2] );
+				$sub_file  = $sub_item[2];
+				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) ) {
+					$sub_file = substr( $sub_file, 0, $pos );
+				}
 
-				$title = wptexturize($sub_item[0]);
+				$title = wptexturize( $sub_item[0] );
 
 				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
+					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {
 						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
-					else
+					} else {
 						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+					}
 
 					$sub_item_url = esc_url( $sub_item_url );
 					echo "<li$class><a href='$sub_item_url'$class$aria_attributes>$title</a></li>";
@@ -238,9 +246,9 @@
 					echo "<li$class><a href='{$sub_item[2]}'$class$aria_attributes>$title</a></li>";
 				}
 			}
-			echo "</ul>";
+			echo '</ul>';
 		}
-		echo "</li>";
+		echo '</li>';
 	}
 
 	echo '<li id="collapse-menu" class="hide-if-no-js">' .