Ticket #39334: 39334.2.patch

wp-admin/themes.php

@@ -22 +22 @@
                 check_admin_referer('switch-theme_' . $_GET['stylesheet']);
                 $theme = wp_get_theme( $_GET['stylesheet'] );
 
-                if ( ! $theme->exists() || ! $theme->is_allowed() ) {
+                if ( ! $theme->exists() ) {
                         wp_die(
                                 '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
                                 '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
@@ -30 +30 @@
                         );
                 }
 
+                if ( ! $theme->is_allowed() && current_user_can( 'manage_network_themes' ) ) {
+                        WP_Theme::network_enable_theme( $theme->get_stylesheet() );
+                }
+
                 switch_theme( $theme->get_stylesheet() );
                 wp_redirect( admin_url('themes.php?activated=true') );
                 exit;
@@ -119 +123 @@
         '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
-if ( current_user_can( 'switch_themes' ) ) {
+if ( current_user_can( 'manage_network_themes' ) ) {
+        // Display all themes to allow network administrator who can manage themes to network activate it
+        $themes = wp_prepare_themes_for_js( wp_get_themes() );
+} else if ( current_user_can( 'switch_themes' ) ) {
+        // Display only allowed themes
         $themes = wp_prepare_themes_for_js();
 } else {
         $themes = wp_prepare_themes_for_js( array( wp_get_theme() ) );