Ticket #30594: enable_themes_function_2.diff

src/wp-admin/network/themes.php

@@ -29 +29 @@
 $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_network_enable_theme( $_GET['theme'] );
                         if ( false === strpos( $referer, '/network/themes.php' ) )
                                 wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
                         else
@@ -42 +40 @@
                         exit;
                 case 'disable':
                         check_admin_referer('disable-theme_' . $_GET['theme']);
-                        unset( $allowed_themes[ $_GET['theme'] ] );
-                        update_site_option( 'allowedthemes', $allowed_themes );
+                        wp_network_disable_theme( $_GET['theme'] );
                         wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
                         exit;
                 case 'enable-selected':
@@ -53 +50 @@
                                 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_network_enable_theme( (array) $themes );
                         wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
                         exit;
                 case 'disable-selected':
@@ -65 +60 @@
                                 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_network_disable_theme( (array) $themes );
                         wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
                         exit;
                 case 'update-selected' :

src/wp-includes/class-wp-theme.php

@@ -1195 +1195 @@
         }
 
         /**
+         * Enable a theme for a whole network
+         * 
+         * @param mixed $stylesheet Stylesheet name or array of stylesheets
+         * @access public
+         */
+        public static function network_enable_theme( $stylesheets ) {
+
+                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 a whole network
+         * 
+         * @param mixed $stylesheet Stylesheet name or array of stylesheets
+         * @access public
+         */
+        public static function network_disable_theme( $stylesheets ) {
+                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 );
+        }
+
+        /**
          * Sort themes by name.
          *
          * @since 3.4.0

src/wp-includes/ms-functions.php

@@ -2431 +2431 @@
 
         return $site_results;
 }
+
+/**
+ * Enable a theme for a whole network
+ * 
+ * @uses WP_Theme::network_enable_theme()
+ * 
+ * @param mixed $stylesheet Stylesheet name or array of stylesheets
+ */
+function wp_network_enable_theme( $stylesheets ) {
+
+        WP_Theme::network_enable_theme( $stylesheets );
+
+}
+
+/**
+ * Disable a theme network wide
+ * 
+ * @uses WP_Theme::network_disable_theme()
+ * 
+ * @param mixed $stylesheet Stylesheet name or array of stylesheets
+ */
+function wp_network_disable_theme( $stylesheets ) {
+
+        WP_Theme::network_disable_theme( $stylesheets );
+
+}