Ticket #14897: 14897.12.diff

wp-admin/network/themes.php

@@ -23 +23 @@
         $allowed_themes = get_site_option( 'allowedthemes' );   
         switch ( $action ) {
                 case 'network-enable':
-                        $allowed_themes[ $_GET['theme'] ] = 1;
+                        $allowed_themes[ $_GET['theme'] ] = true;
                         update_site_option( 'allowedthemes', $allowed_themes );
                         wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
                         exit;                   
@@ -41 +41 @@
                                 exit;
                         }                                               
                         foreach( (array) $themes as $theme )
-                                $allowed_themes[ $theme ] = 1;
+                                $allowed_themes[ $theme ] = true;
                         update_site_option( 'allowedthemes', $allowed_themes );
                         break;
                 case 'network-disable-selected':

wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -58 +58 @@
                 $current = get_site_transient( 'update_themes' );
 
                 foreach ( (array) $themes['all'] as $key => $theme ) {
-                        if ( array_key_exists( $theme['Template'], $allowed_themes ) ) {
+                        $theme_key = esc_html( $theme['Stylesheet'] );
+                        if ( isset( $allowed_themes [ $theme_key ] ) )  {
                                 $themes['all'][$key]['enabled'] = true;
                                 $themes['enabled'][$key] = $themes['all'][$key];
                         }