diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index fbc2aa033c..1b9830ccce 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -29,12 +29,10 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] $referer = remove_query_arg( $temp_args, wp_get_referer() ); if ( $action ) { - $allowed_themes = get_site_option( 'allowedthemes' ); switch ( $action ) { case 'enable': check_admin_referer('enable-theme_' . $_GET['theme']); - $allowed_themes[ $_GET['theme'] ] = true; - update_site_option( 'allowedthemes', $allowed_themes ); + WP_Theme::network_enable_theme( $_GET['theme'] ); if ( false === strpos( $referer, '/network/themes.php' ) ) wp_redirect( network_admin_url( 'themes.php?enabled=1' ) ); else @@ -42,8 +40,7 @@ if ( $action ) { exit; case 'disable': check_admin_referer('disable-theme_' . $_GET['theme']); - unset( $allowed_themes[ $_GET['theme'] ] ); - update_site_option( 'allowedthemes', $allowed_themes ); + WP_Theme::network_disable_theme( $_GET['theme'] ); wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) ); exit; case 'enable-selected': @@ -53,9 +50,7 @@ if ( $action ) { wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) ); exit; } - foreach ( (array) $themes as $theme ) - $allowed_themes[ $theme ] = true; - update_site_option( 'allowedthemes', $allowed_themes ); + WP_Theme::network_enable_theme( (array) $themes ); wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) ); exit; case 'disable-selected': @@ -65,9 +60,7 @@ if ( $action ) { wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) ); exit; } - foreach ( (array) $themes as $theme ) - unset( $allowed_themes[ $theme ] ); - update_site_option( 'allowedthemes', $allowed_themes ); + WP_Theme::network_disable_theme( (array) $themes ); wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) ); exit; case 'update-selected' : diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index d98fb3149b..dee2fe7c4b 100644 --- a/wp-includes/class-wp-theme.php +++ b/wp-includes/class-wp-theme.php @@ -1315,6 +1315,62 @@ final class WP_Theme implements ArrayAccess { return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id ); } + /** + * Enable a theme for all sites on the current network. + * + * @since 4.6.0 + * + * @static + * @access public + * + * @param string|array $stylesheets Stylesheet name or array of stylesheet names. + */ + public static function network_enable_theme( $stylesheets ) { + if ( ! is_multisite() ) { + return; + } + + if ( ! is_array( $stylesheets ) ) { + $stylesheets = array( $stylesheets ); + } + + $allowed_themes = get_site_option( 'allowedthemes' ); + foreach ( $stylesheets as $stylesheet ) { + $allowed_themes[ $stylesheet ] = true; + } + + update_site_option( 'allowedthemes', $allowed_themes ); + } + + /** + * Disable a theme for all sites on the current network. + * + * @since 4.6.0 + * + * @static + * @access public + * + * @param string|array $stylesheets Stylesheet name or array of stylesheet names. + */ + public static function network_disable_theme( $stylesheets ) { + if ( ! is_multisite() ) { + return; + } + + if ( ! is_array( $stylesheets ) ) { + $stylesheets = array( $stylesheets ); + } + + $allowed_themes = get_site_option( 'allowedthemes' ); + foreach ( $stylesheets as $stylesheet ) { + if ( isset( $allowed_themes[ $stylesheet ] ) ) { + unset( $allowed_themes[ $stylesheet ] ); + } + } + + update_site_option( 'allowedthemes', $allowed_themes ); + } + /** * Sorts themes by name. * diff --git a/wp-includes/version.php b/wp-includes/version.php index b238fef9bf..93c2261d33 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37201'; +$wp_version = '4.6-alpha-37202'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.