diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index d2a2203056..fb3c33e7ad 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -618,7 +618,26 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
break;
case 'name':
- echo "
" . $item->display('Name') . "";
+
+ $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 = ' — ' . __( 'Active Theme' );
+ }
+
+ /* In case this is a child theme, label it properly */
+ if ( $stylesheet !== $template && $item->get_stylesheet() === $stylesheet) {
+ $active_theme_label = ' — ' . __( 'Active Child Theme' );
+ }
+ }
+
+ echo " | " . $item->display( 'Name' ) . $active_theme_label . '';
$this->column_name( $item );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 011fe71cb6..42fc8c273b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.9-alpha-41213';
+$wp_version = '4.9-alpha-41214';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|