Ticket #13743: 13743.8.patch

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

@@ -44 +44 @@
                 ) );
 
                 $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-                if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
+                if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken', 'default' ) ) )
                         $status = 'all';
 
                 $page = $this->get_pagenum();
@@ -104 +104 @@
                         'disabled' => array(),
                         'upgrade' => array(),
                         'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
+                        'default' => array( wp_get_theme( get_network_option( null, 'default_theme', WP_DEFAULT_THEME ) ) ),
                 );
 
                 if ( $this->is_site_themes ) {
@@ -301 +302 @@
                                 case 'broken' :
                                         $text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
                                         break;
+                                case 'default' :
+                                        $text = __( 'Default' ) . ' <span class="count">(1)</span>';
+                                        break;
                         }
 
                         if ( $this->is_site_themes )
@@ -396 +400 @@
                         'enable' => '',
                         'disable' => '',
                         'edit' => '',
-                        'delete' => ''
+                        'delete' => '',
+                        'default' => '',
                 );
 
                 $stylesheet = $theme->get_stylesheet();
@@ -426 +431 @@
                                 );
                         }
                 } else {
-                        $url = add_query_arg( array(
-                                'action' => 'disable',
-                                'theme'  => $theme_key,
-                                'paged'  => $page,
-                                's'      => $s,
-                        ), $url );
+                        // Set default theme raw action
+                        if ( $theme->get_stylesheet() !== get_network_option( null, 'default_theme', WP_DEFAULT_THEME ) ) {
+                                $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' ) );
+                                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' ) )
+                                );
+
+                                // Set network default theme
+                                $url = add_query_arg( array(
+                                        'action' => 'default',
+                                        'theme'  => $theme_key,
+                                        'theme_status' => $context,
+                                        'paged'  => $page,
+                                        's'      => $s,
+                                ), $url );
+
+                                $actions['default'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+                                        esc_url( wp_nonce_url( $url, 'default-theme_' . $stylesheet ) ),
+                                        esc_attr( sprintf( __( 'Make Default %s' ), $theme->display( 'Name' ) ) ),
+                                        __( 'Make Default' )
+                                );
                         }
-
-                        $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') ) {
@@ -643 +666 @@
                                         break;
 
                                 case 'name':
-                                        echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
+                                        printf( "<td class='theme-title column-primary%s'><strong>%s%s</strong>",
+                                                $extra_classes,
+                                                $item->display('Name'),
+                                                ( $item->get_stylesheet() === $item->network_get_default_theme() ) ? ' - ' . __( 'Default Theme' ) : ''
+                                        );
 
                                         $this->column_name( $item );
 

wp-admin/includes/schema.php

@@ -365 +365 @@
                 $uploads_use_yearmonth_folders = 1;
         }
 
-        // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
         $stylesheet = $template = WP_DEFAULT_THEME;
-        $theme = wp_get_theme( WP_DEFAULT_THEME );
-        if ( ! $theme->exists() ) {
-                $theme = WP_Theme::get_core_default_theme();
+
+        // If it's multisite and WP_DEFAULT_THEME is not redifined in WP Config, get the network default theme
+        if ( is_multisite() ) {
+                $default_theme = get_network_option( null, 'default_theme', false );
+
+                if ( ! empty( $default_theme ) ) {
+                        $theme = wp_get_theme( $default_theme );
+                        if ( $theme->exists() ) {
+                                $stylesheet = $theme->get_stylesheet();
+                                $template   = $theme->get_template();
+                        }
+                }
+        }
+
+        if ( empty ( $theme ) || ! $theme->exists() ) {
+                $theme = wp_get_theme( WP_DEFAULT_THEME );
+
+                // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
+                if ( ! $theme->exists() ) {
+                        $theme = WP_Theme::get_core_default_theme();
+                }
         }
 
         // If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.

wp-admin/network/settings.php

@@ -202 +202 @@
                 </table>
                 <h2><?php _e( 'New Site Settings' ); ?></h2>
                 <table class="form-table">
-
                         <tr>
                                 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
                                 <td>

wp-admin/network/themes.php

@@ -40 +40 @@
                         WP_Theme::network_disable_theme( $_GET['theme'] );
                         wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
                         exit;
+                case 'default':
+                        check_admin_referer('default-theme_' . $_GET['theme']);
+                        WP_Theme::network_set_default_theme( $_GET['theme'] );
+                        wp_safe_redirect( add_query_arg( 'default', '1', $referer ) );
+                        exit;
                 case 'enable-selected':
                         check_admin_referer('bulk-themes');
                         $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
@@ -287 +292 @@
                 $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
         }
         echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
+} elseif ( isset( $_GET['default'] ) ) {
+        $message = __( 'Network default theme has been set.' );
+        echo '<div id="message" class="updated notice is-dismissible"><p>' . $message . '</p></div>';
 } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
 } elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {

wp-includes/class-wp-theme.php

@@ -1431 +1431 @@
         }
 
         /**
+         * Set the network default theme.
+         *
+         * @since 4.8.0
+         * @access public
+         * @static
+         *
+         * @param string $stylesheet name.
+         */
+        public static function network_set_default_theme( $stylesheet ) {
+                if ( ! is_multisite() ) {
+                        return false;
+                }
+
+                $theme = wp_get_theme( $stylesheet );
+                if ( ! $theme->exists() ) {
+                        return false;
+                }
+
+                if ( ! $theme->is_allowed() ) {
+                        return false;
+                }
+
+                update_network_option( null, 'default_theme', $stylesheet );
+        }
+
+        /**
+         * Get the network default theme.
+         *
+         * @since 4.8.0
+         * @access public
+         * @static
+         */
+        public static function network_get_default_theme() {
+                return get_network_option( null, 'default_theme', WP_DEFAULT_THEME );
+        }
+
+        /**
          * Sorts themes by name.
          *
          * @since 3.4.0