diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/class-wp-ms-themes-list-table.php
--- a/wp/wp-admin/includes/class-wp-ms-themes-list-table.php	Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-ms-themes-list-table.php	Mon Oct 14 17:39:30 2019 +0200
@@ -1,11 +1,19 @@
 <?php
 /**
- * MS Themes List Table class.
+ * List Table API: WP_MS_Themes_List_Table class
  *
  * @package WordPress
- * @subpackage List_Table
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying themes in a list table for the network admin.
+ *
  * @since 3.1.0
  * @access private
+ *
+ * @see WP_List_Table
  */
 class WP_MS_Themes_List_Table extends WP_List_Table {
 
@@ -18,10 +26,12 @@
 	 * Constructor.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
+	 * @global string $status
+	 * @global int    $page
+	 *
 	 * @param array $args An associative array of arguments.
 	 */
 	public function __construct( $args = array() ) {
@@ -38,17 +48,25 @@
 
 		$page = $this->get_pagenum();
 
-		$this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
+		$this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
 
 		if ( $this->is_site_themes )
 			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 	}
 
+	/**
+	 *
+	 * @return array
+	 */
 	protected function get_table_classes() {
 		// todo: remove and add CSS for .themes
 		return array( 'widefat', 'plugins' );
 	}
 
+	/**
+	 *
+	 * @return bool
+	 */
 	public function ajax_user_can() {
 		if ( $this->is_site_themes )
 			return current_user_can( 'manage_sites' );
@@ -56,6 +74,15 @@
 			return current_user_can( 'manage_network_themes' );
 	}
 
+	/**
+	 *
+	 * @global string $status
+	 * @global array $totals
+	 * @global int $page
+	 * @global string $orderby
+	 * @global string $order
+	 * @global string $s
+	 */
 	public function prepare_items() {
 		global $status, $totals, $page, $orderby, $order, $s;
 
@@ -63,7 +90,7 @@
 
 		$themes = array(
 			/**
-			 * Filter the full array of WP_Theme objects to list in the Multisite
+			 * Filters the full array of WP_Theme objects to list in the Multisite
 			 * themes list table.
 			 *
 			 * @since 3.1.0
@@ -121,13 +148,19 @@
 		$this->has_items = ! empty( $themes['all'] );
 		$total_this_page = $totals[ $status ];
 
+		wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+			'themes' => $totals,
+			'totals' => wp_get_update_data(),
+		) );
+
 		if ( $orderby ) {
 			$orderby = ucfirst( $orderby );
 			$order = strtoupper( $order );
 
-			if ( $orderby == 'Name' ) {
-				if ( 'ASC' == $order )
+			if ( $orderby === 'Name' ) {
+				if ( 'ASC' === $order ) {
 					$this->items = array_reverse( $this->items );
+				}
 			} else {
 				uasort( $this->items, array( $this, '_order_callback' ) );
 			}
@@ -150,7 +183,7 @@
 	 * @return bool
 	 */
 	public function _search_callback( $theme ) {
-		static $term;
+		static $term = null;
 		if ( is_null( $term ) )
 			$term = wp_unslash( $_REQUEST['s'] );
 
@@ -186,22 +219,27 @@
 		if ( $a == $b )
 			return 0;
 
-		if ( 'DESC' == $order )
+		if ( 'DESC' === $order )
 			return ( $a < $b ) ? 1 : -1;
 		else
 			return ( $a < $b ) ? -1 : 1;
 	}
 
+	/**
+	 */
 	public function no_items() {
-		if ( ! $this->has_items )
+		if ( $this->has_items ) {
 			_e( 'No themes found.' );
-		else
+		} else {
 			_e( 'You do not appear to have any themes available at this time.' );
+		}
 	}
 
+	/**
+	 *
+	 * @return array
+	 */
 	public function get_columns() {
-		global $status;
-
 		return array(
 			'cb'          => '<input type="checkbox" />',
 			'name'        => __( 'Theme' ),
@@ -209,12 +247,33 @@
 		);
 	}
 
+	/**
+	 *
+	 * @return array
+	 */
 	protected function get_sortable_columns() {
 		return array(
 			'name'         => 'name',
 		);
 	}
 
+	/**
+	 * Gets the name of the primary column.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @return string Unalterable name of the primary column name, in this case, 'name'.
+	 */
+	protected function get_primary_column_name() {
+		return 'name';
+	}
+
+	/**
+	 *
+	 * @global array $totals
+	 * @global string $status
+	 * @return array
+	 */
 	protected function get_views() {
 		global $totals, $status;
 
@@ -247,9 +306,9 @@
 				$url = 'themes.php';
 
 			if ( 'search' != $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+				$status_links[$type] = sprintf( "<a href='%s'%s>%s</a>",
 					esc_url( add_query_arg('theme_status', $type, $url) ),
-					( $type == $status ) ? ' class="current"' : '',
+					( $type === $status ) ? ' class="current" aria-current="page"' : '',
 					sprintf( $text, number_format_i18n( $count ) )
 				);
 			}
@@ -258,6 +317,11 @@
 		return $status_links;
 	}
 
+	/**
+	 * @global string $status
+	 *
+	 * @return array
+	 */
 	protected function get_bulk_actions() {
 		global $status;
 
@@ -275,20 +339,41 @@
 		return $actions;
 	}
 
+	/**
+	 */
 	public function display_rows() {
 		foreach ( $this->items as $theme )
 			$this->single_row( $theme );
 	}
 
 	/**
+	 * Handles the checkbox column output.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param WP_Theme $theme The current WP_Theme object.
+	 */
+	public function column_cb( $theme ) {
+		$checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+		?>
+		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
+		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
+		<?php
+	}
+
+	/**
+	 * Handles the name column output.
+	 *
+	 * @since 4.3.0
+	 *
 	 * @global string $status
-	 * @global int $page
+	 * @global int    $page
 	 * @global string $s
-	 * @global array $totals
-	 * @param WP_Theme $theme
+	 *
+	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
-	public function single_row( $theme ) {
-		global $status, $page, $s, $totals;
+	public function column_name( $theme ) {
+		global $status, $page, $s;
 
 		$context = $status;
 
@@ -304,7 +389,6 @@
 		$actions = array(
 			'enable' => '',
 			'disable' => '',
-			'edit' => '',
 			'delete' => ''
 		);
 
@@ -312,20 +396,71 @@
 		$theme_key = urlencode( $stylesheet );
 
 		if ( ! $allowed ) {
-			if ( ! $theme->errors() )
-				$actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
+			if ( ! $theme->errors() ) {
+				$url = add_query_arg( array(
+					'action' => 'enable',
+					'theme'  => $theme_key,
+					'paged'  => $page,
+					's'      => $s,
+				), $url );
+
+				if ( $this->is_site_themes ) {
+					/* translators: %s: theme name */
+					$aria_label = sprintf( __( 'Enable %s' ), $theme->display( 'Name' ) );
+				} else {
+					/* translators: %s: theme name */
+					$aria_label = sprintf( __( 'Network Enable %s' ), $theme->display( 'Name' ) );
+				}
+
+				$actions['enable'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
+					esc_url( wp_nonce_url( $url, 'enable-theme_' . $stylesheet ) ),
+					esc_attr( $aria_label ),
+					( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) )
+				);
+			}
 		} else {
-			$actions['disable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=disable&amp;theme=' . $theme_key . '&amp;paged=' . $page . '&amp;s=' . $s, 'disable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Disable this theme') . '">' . ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) . '</a>';
+			$url = add_query_arg( array(
+				'action' => 'disable',
+				'theme'  => $theme_key,
+				'paged'  => $page,
+				's'      => $s,
+			), $url );
+
+			if ( $this->is_site_themes ) {
+				/* translators: %s: theme name */
+				$aria_label = sprintf( __( 'Disable %s' ), $theme->display( 'Name' ) );
+			} else {
+				/* translators: %s: theme name */
+				$aria_label = sprintf( __( 'Network Disable %s' ), $theme->display( 'Name' ) );
+			}
+
+			$actions['disable'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+				esc_url( wp_nonce_url( $url, 'disable-theme_' . $stylesheet ) ),
+				esc_attr( $aria_label ),
+				( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) )
+			);
 		}
 
-		if ( current_user_can('edit_themes') )
-			$actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . $theme_key ) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
+		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
+			$url = add_query_arg( array(
+				'action'       => 'delete-selected',
+				'checked[]'    => $theme_key,
+				'theme_status' => $context,
+				'paged'        => $page,
+				's'            => $s,
+			), 'themes.php' );
 
-		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) )
-			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&amp;checked[]=' . $theme_key . '&amp;theme_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+			/* translators: %s: theme name */
+			$aria_label = sprintf( _x( 'Delete %s', 'theme' ), $theme->display( 'Name' ) );
 
+			$actions['delete'] = sprintf( '<a href="%s" class="delete" aria-label="%s">%s</a>',
+				esc_url( wp_nonce_url( $url, 'bulk-themes' ) ),
+				esc_attr( $aria_label ),
+				__( 'Delete' )
+			);
+		}
 		/**
-		 * Filter the action links displayed for each theme in the Multisite
+		 * Filters the action links displayed for each theme in the Multisite
 		 * themes list table.
 		 *
 		 * The action links displayed are determined by the theme's status, and
@@ -335,21 +470,21 @@
 		 * non-network enabled themes when editing a site in the Network admin.
 		 *
 		 * The default action links for the Network themes list table include
-		 * 'Network Enable', 'Network Disable', 'Edit', and 'Delete'.
+		 * 'Network Enable', 'Network Disable', and 'Delete'.
 		 *
 		 * The default action links for the Site themes list table include
-		 * 'Enable', 'Disable', and 'Edit'.
+		 * 'Enable', and 'Disable'.
 		 *
 		 * @since 2.8.0
 		 *
 		 * @param array    $actions An array of action links.
 		 * @param WP_Theme $theme   The current WP_Theme object.
-		 * @param string   $context Status of the theme.
+		 * @param string   $context Status of the theme, one of 'all', 'enabled', or 'disabled'.
 		 */
 		$actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context );
 
 		/**
-		 * Filter the action links of a specific theme in the Multisite themes
+		 * Filters the action links of a specific theme in the Multisite themes
 		 * list table.
 		 *
 		 * The dynamic portion of the hook name, `$stylesheet`, refers to the
@@ -360,91 +495,202 @@
 		 *
 		 * @param array    $actions An array of action links.
 		 * @param WP_Theme $theme   The current WP_Theme object.
-		 * @param string   $context Status of the theme.
+		 * @param string   $context Status of the theme, one of 'all', 'enabled', or 'disabled'.
 		 */
-		$actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
+		$actions = apply_filters( "theme_action_links_{$stylesheet}", $actions, $theme, $context );
+
+		echo $this->row_actions( $actions, true );
+	}
+
+	/**
+	 * Handles the description column output.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @global string $status
+	 * @global array  $totals
+	 *
+	 * @param WP_Theme $theme The current WP_Theme object.
+	 */
+	public function column_description( $theme ) {
+		global $status, $totals;
+		if ( $theme->errors() ) {
+			$pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
+			echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+		}
+
+		if ( $this->is_site_themes ) {
+			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		} else {
+			$allowed = $theme->is_allowed( 'network' );
+		}
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		$checkbox_id = "checkbox_" . md5( $theme->get('Name') );
-		$checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $stylesheet ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme->display('Name') . "</label>";
-
-		$id = sanitize_html_class( $theme->get_stylesheet() );
-
 		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
 			$class .= ' update';
 
-		echo "<tr id='$id' class='$class'>";
+		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
+			<div class='$class second theme-version-author-uri'>";
+
+		$stylesheet = $theme->get_stylesheet();
+		$theme_meta = array();
+
+		if ( $theme->get('Version') ) {
+			$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+		}
+		$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+
+		if ( $theme->get('ThemeURI') ) {
+			/* translators: %s: theme name */
+			$aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
 
-		list( $columns, $hidden ) = $this->get_column_info();
+			$theme_meta[] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+				$theme->display( 'ThemeURI' ),
+				esc_attr( $aria_label ),
+				__( 'Visit Theme Site' )
+			);
+		}
+		/**
+		 * Filters the array of row meta for each theme in the Multisite themes
+		 * list table.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param array    $theme_meta An array of the theme's metadata,
+		 *                             including the version, author, and
+		 *                             theme URI.
+		 * @param string   $stylesheet Directory name of the theme.
+		 * @param WP_Theme $theme      WP_Theme object.
+		 * @param string   $status     Status of the theme.
+		 */
+		$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
+		echo implode( ' | ', $theme_meta );
+
+		echo '</div>';
+	}
+
+	/**
+	 * Handles default column output.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param WP_Theme $theme       The current WP_Theme object.
+	 * @param string   $column_name The current column name.
+	 */
+	public function column_default( $theme, $column_name ) {
+		$stylesheet = $theme->get_stylesheet();
+
+		/**
+		 * Fires inside each custom column of the Multisite themes list table.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param string   $column_name Name of the column.
+		 * @param string   $stylesheet  Directory name of the theme.
+		 * @param WP_Theme $theme       Current WP_Theme object.
+		 */
+		do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+	}
+
+	/**
+	 * Handles the output for a single table row.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param WP_Theme $item The current WP_Theme object.
+	 */
+	public function single_row_columns( $item ) {
+		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$style = '';
-			if ( in_array( $column_name, $hidden ) )
-				$style = ' style="display:none;"';
+			$extra_classes = '';
+			if ( in_array( $column_name, $hidden ) ) {
+				$extra_classes .= ' hidden';
+			}
 
 			switch ( $column_name ) {
 				case 'cb':
-					echo "<th scope='row' class='check-column'>$checkbox</th>";
+					echo '<th scope="row" class="check-column">';
+
+					$this->column_cb( $item );
+
+					echo '</th>';
 					break;
+
 				case 'name':
-					echo "<td class='theme-title'$style><strong>" . $theme->display('Name') . "</strong>";
-					echo $this->row_actions( $actions, true );
+
+					$active_theme_label = '';
+
+					/* The presence of the site_id property means that this is a subsite view and a label for the active theme needs to be added */
+					if ( ! empty( $this->site_id ) ) {
+						$stylesheet = get_blog_option( $this->site_id, 'stylesheet' );
+						$template   = get_blog_option( $this->site_id, 'template' );
+
+						/* Add a label for the active template */
+						if ( $item->get_template() === $template ) {
+							$active_theme_label = ' &mdash; ' . __( 'Active Theme' );
+						}
+
+						/* In case this is a child theme, label it properly */
+						if ( $stylesheet !== $template && $item->get_stylesheet() === $stylesheet) {
+							$active_theme_label = ' &mdash; ' . __( 'Active Child Theme' );
+						}
+					}
+
+					echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display( 'Name' ) . $active_theme_label . '</strong>';
+
+					$this->column_name( $item );
+
 					echo "</td>";
 					break;
+
 				case 'description':
-					echo "<td class='column-description desc'$style>";
-					if ( $theme->errors() ) {
-						$pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
-						echo '<p><strong class="attention">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
-					}
-					echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
-						<div class='$class second theme-version-author-uri'>";
-
-					$theme_meta = array();
-
-					if ( $theme->get('Version') )
-						$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
-
-					$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+					echo "<td class='column-description desc{$extra_classes}'>";
 
-					if ( $theme->get('ThemeURI') )
-						$theme_meta[] = '<a href="' . $theme->display('ThemeURI') . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
+					$this->column_description( $item );
 
-					/**
-					 * Filter the array of row meta for each theme in the Multisite themes
-					 * list table.
-					 *
-					 * @since 3.1.0
-					 *
-					 * @param array    $theme_meta An array of the theme's metadata,
-					 *                             including the version, author, and
-					 *                             theme URI.
-					 * @param string   $stylesheet Directory name of the theme.
-					 * @param WP_Theme $theme      WP_Theme object.
-					 * @param string   $status     Status of the theme.
-					 */
-					$theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
-					echo implode( ' | ', $theme_meta );
-
-					echo "</div></td>";
+					echo '</td>';
 					break;
 
 				default:
-					echo "<td class='$column_name column-$column_name'$style>";
+					echo "<td class='$column_name column-$column_name{$extra_classes}'>";
 
-					/**
-					 * Fires inside each custom column of the Multisite themes list table.
-					 *
-					 * @since 3.1.0
-					 *
-					 * @param string   $column_name Name of the column.
-					 * @param string   $stylesheet  Directory name of the theme.
-					 * @param WP_Theme $theme       Current WP_Theme object.
-					 */
-					do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+					$this->column_default( $item, $column_name );
+
 					echo "</td>";
+					break;
 			}
 		}
+	}
+
+	/**
+	 * @global string $status
+	 * @global array  $totals
+	 *
+	 * @param WP_Theme $theme
+	 */
+	public function single_row( $theme ) {
+		global $status, $totals;
+
+		if ( $this->is_site_themes ) {
+			$allowed = $theme->is_allowed( 'site', $this->site_id );
+		} else {
+			$allowed = $theme->is_allowed( 'network' );
+		}
+
+		$stylesheet = $theme->get_stylesheet();
+
+		$class = ! $allowed ? 'inactive' : 'active';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+			$class .= ' update';
+		}
+
+		printf( '<tr class="%s" data-slug="%s">',
+			esc_attr( $class ),
+			esc_attr( $stylesheet )
+		);
+
+		$this->single_row_columns( $theme );
 
 		echo "</tr>";
 
@@ -475,6 +721,6 @@
 		 * @param WP_Theme $theme      Current WP_Theme object.
 		 * @param string   $status     Status of the theme.
 		 */
-		do_action( "after_theme_row_$stylesheet", $stylesheet, $theme, $status );
+		do_action( "after_theme_row_{$stylesheet}", $stylesheet, $theme, $status );
 	}
 }