diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/theme-install.php
--- a/wp/wp-admin/includes/theme-install.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/includes/theme-install.php	Mon Oct 14 18:28:13 2019 +0200
@@ -6,21 +6,52 @@
  * @subpackage Administration
  */
 
-$themes_allowedtags = array('a' => array('href' => array(), 'title' => array(), 'target' => array()),
-	'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
-	'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
-	'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
-	'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
-	'img' => array('src' => array(), 'class' => array(), 'alt' => array())
+$themes_allowedtags = array(
+	'a'       => array(
+		'href'   => array(),
+		'title'  => array(),
+		'target' => array(),
+	),
+	'abbr'    => array( 'title' => array() ),
+	'acronym' => array( 'title' => array() ),
+	'code'    => array(),
+	'pre'     => array(),
+	'em'      => array(),
+	'strong'  => array(),
+	'div'     => array(),
+	'p'       => array(),
+	'ul'      => array(),
+	'ol'      => array(),
+	'li'      => array(),
+	'h1'      => array(),
+	'h2'      => array(),
+	'h3'      => array(),
+	'h4'      => array(),
+	'h5'      => array(),
+	'h6'      => array(),
+	'img'     => array(
+		'src'   => array(),
+		'class' => array(),
+		'alt'   => array(),
+	),
 );
 
-$theme_field_defaults = array( 'description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
-	'rating' => true, 'downloaded' => true, 'downloadlink' => true, 'last_updated' => true, 'homepage' => true,
-	'tags' => true, 'num_ratings' => true
+$theme_field_defaults = array(
+	'description'  => true,
+	'sections'     => false,
+	'tested'       => true,
+	'requires'     => true,
+	'rating'       => true,
+	'downloaded'   => true,
+	'downloadlink' => true,
+	'last_updated' => true,
+	'homepage'     => true,
+	'tags'         => true,
+	'num_ratings'  => true,
 );
 
 /**
- * Retrieve list of WordPress theme features (aka theme tags)
+ * Retrieve list of WordPress theme features (aka theme tags).
  *
  * @since 2.8.0
  *
@@ -31,15 +62,18 @@
 function install_themes_feature_list() {
 	_deprecated_function( __FUNCTION__, '3.1.0', 'get_theme_feature_list()' );
 
-	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
+	if ( ! $cache = get_transient( 'wporg_theme_feature_list' ) ) {
 		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
-	if ( $cache )
+	if ( $cache ) {
 		return $cache;
+	}
 
 	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) )
+	if ( is_wp_error( $feature_list ) ) {
 		return array();
+	}
 
 	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -56,38 +90,41 @@
 function install_theme_search_form( $type_selector = true ) {
 	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector )
+	if ( ! $type_selector ) {
 		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+	}
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
 	<?php if ( $type_selector ) : ?>
-	<label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
+	<label class="screen-reader-text" for="typeselector"><?php _e( 'Type of search' ); ?></label>
 	<select	name="type" id="typeselector">
-	<option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
-	<option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
-	<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
+	<option value="term" <?php selected( 'term', $type ); ?>><?php _e( 'Keyword' ); ?></option>
+	<option value="author" <?php selected( 'author', $type ); ?>><?php _e( 'Author' ); ?></option>
+	<option value="tag" <?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Theme Installer' ); ?></option>
 	</select>
-	<label class="screen-reader-text" for="s"><?php
-	switch ( $type ) {
-		case 'term':
-			_e( 'Search by keyword' );
-			break;
-		case 'author':
-			_e( 'Search by author' );
-			break;
-		case 'tag':
-			_e( 'Search by tag' );
-			break;
-	}
-	?></label>
+	<label class="screen-reader-text" for="s">
+		<?php
+		switch ( $type ) {
+			case 'term':
+				_e( 'Search by keyword' );
+				break;
+			case 'author':
+				_e( 'Search by author' );
+				break;
+			case 'tag':
+				_e( 'Search by tag' );
+				break;
+		}
+		?>
+	</label>
 	<?php else : ?>
-	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
+	<label class="screen-reader-text" for="s"><?php _e( 'Search by keyword' ); ?></label>
 	<?php endif; ?>
-	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
+	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr( $term ); ?>" autofocus="autofocus" />
 	<?php submit_button( __( 'Search' ), '', 'search', false ); ?>
 </form>
-<?php
+	<?php
 }
 
 /**
@@ -97,8 +134,8 @@
  */
 function install_themes_dashboard() {
 	install_theme_search_form( false );
-?>
-<h4><?php _e('Feature Filter') ?></h4>
+	?>
+<h4><?php _e( 'Feature Filter' ); ?></h4>
 <p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
 
 <form method="get">
@@ -114,8 +151,8 @@
 		echo '<ol class="feature-group">';
 		foreach ( $features as $feature => $feature_name ) {
 			$feature_name = esc_html( $feature_name );
-			$feature = esc_attr($feature);
-?>
+			$feature      = esc_attr( $feature );
+			?>
 
 <li>
 	<input type="checkbox" name="features[]" id="feature-id-<?php echo $feature; ?>" value="<?php echo $feature; ?>" />
@@ -125,23 +162,24 @@
 <?php	} ?>
 </ol>
 <br class="clear" />
-<?php
-	} ?>
+		<?php
+	}
+	?>
 
 </div>
 <br class="clear" />
-<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
+	<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
 </form>
-<?php
+	<?php
 }
 
 /**
  * @since 2.8.0
  */
 function install_themes_upload() {
-?>
-<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.'); ?></p>
-<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-theme'); ?>">
+	?>
+<p class="install-help"><?php _e( 'If you have a theme in a .zip format, you may install it by uploading it here.' ); ?></p>
+<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-theme' ); ?>">
 	<?php wp_nonce_field( 'theme-upload' ); ?>
 	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
 	<input type="file" id="themezip" name="themezip" />
@@ -163,7 +201,7 @@
 	_deprecated_function( __FUNCTION__, '3.4.0' );
 	global $wp_list_table;
 	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
 	}
 	$wp_list_table->prepare_items();
 	$wp_list_table->single_row( $theme );
@@ -180,7 +218,7 @@
 	global $wp_list_table;
 
 	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
 	}
 	$wp_list_table->prepare_items();
 	$wp_list_table->display();
@@ -199,12 +237,13 @@
 
 	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
 
-	if ( is_wp_error( $theme ) )
+	if ( is_wp_error( $theme ) ) {
 		wp_die( $theme );
+	}
 
-	iframe_header( __('Theme Installation') );
+	iframe_header( __( 'Theme Installation' ) );
 	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
 	}
 	$wp_list_table->theme_installer_single( $theme );
 	iframe_footer();