Ticket #39334: 39334.1.patch

wp-admin/includes/theme.php

@@ -564 +564 @@
 
         $parents = array();
 
+        /** @var WP_Theme $theme */
         foreach ( $themes as $theme ) {
                 $slug = $theme->get_stylesheet();
                 $encoded_slug = urlencode( $slug );
@@ -602 +603 @@
                                 'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
                                 'customize' => $customize_action,
                                 'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+                                'network_activate' => ( current_user_can( 'manage_network_themes' ) && ! $theme->is_allowed() ) ? wp_nonce_url( admin_url( 'themes.php?action=network_activate&stylesheet=' . $encoded_slug ), 'network-activate_' . $slug ) : null,
                         ),
                 );
         }

wp-admin/themes.php

@@ -17 +17 @@
         );
 }
 
+if ( current_user_can( 'manage_network_themes' ) && isset($_GET['action'] ) ) {
+        if ( 'network_activate' === $_GET['action'] ) {
+                check_admin_referer( 'network-activate_' . $_GET['stylesheet'] );
+                WP_Theme::network_enable_theme( $_GET['stylesheet'] );
+                wp_redirect( admin_url('themes.php?network_activated=true') );
+                exit;
+        }
+}
+
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
         if ( 'activate' == $_GET['action'] ) {
                 check_admin_referer('switch-theme_' . $_GET['stylesheet']);
@@ -119 +128 @@
         '<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() ) );
@@ -165 +178 @@
         <hr class="wp-header-end">
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
-<div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
+        <div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
 <?php elseif ( isset($_GET['activated']) ) :
-                if ( isset( $_GET['previewed'] ) ) { ?>
+        if ( isset( $_GET['previewed'] ) ) : ?>
                 <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
-                <?php } else { ?>
-<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php
-                }
-        elseif ( isset($_GET['deleted']) ) : ?>
-<div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
+        <?php else : ?>
+                <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
+        <?php endif;
+elseif ( isset( $_GET['deleted'] ) ) : ?>
+        <div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
 <?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
         <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
-<?php
-endif;
+<?php elseif ( isset( $_GET['network_activated'] ) ) : ?>
+        <div id="message5" class="updated notice is-dismissible"><p><?php _e( 'New theme activated on the network, you can now active it on your site.' ); ?></p></div>
+<?php endif;
 
 $ct = wp_get_theme();
 
@@ -281 +295 @@
 
         <div class="theme-actions">
 
-        <?php if ( $theme['active'] ) { ?>
+        <?php if ( $theme['active'] ) : ?>
                 <?php if ( $theme['actions']['customize'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
                         <a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a>
                 <?php } ?>
-        <?php } else { ?>
+        <?php else : ?>
                 <?php
-                /* translators: %s: Theme name */
-                $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-                ?>
-                <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
-                <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
-                        <a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
-                <?php } ?>
-        <?php } ?>
+                if ( $theme['actions']['network_activate'] ) :
+                        /* translators: %s: Theme name */
+                        $aria_label = sprintf( _x( 'Network Activate %s', 'theme' ), '{{ data.name }}' );
+                        ?>
+                        <a class="button activate" href="<?php echo $theme['actions']['network_activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Network Activate' ); ?></a>
+                <?php else :
+                        /* translators: %s: Theme name */
+                        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                        ?>
+                        <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+                        <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
+                                <a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
+                        <?php } ?>
+                <?php endif; ?>
+        <?php endif; ?>
 
         </div>
 </div>
@@ -419 +440 @@
                                 <a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a>
                         <# } #>
                 <# } else { #>
-                        <?php
-                        /* translators: %s: Theme name */
-                        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
-                        <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
+                        <# if ( data.actions.network_activate ) { #>
+                                <?php
+                                /* translators: %s: Theme name */
+                                $aria_label = sprintf( _x( 'Network Activate %s', 'theme' ), '{{ data.name }}' );
+                                ?>
+                                <a class="button activate" href="{{{ data.actions.network_activate }}}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Network Activate' ); ?></a>
+                        <# } else { #>
+                                <?php
+                                /* translators: %s: Theme name */
+                                $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                                ?>
+                                <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
+                                <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
+                        <# } #>
                 <# } #>
         </div>
 </script>