Changeset 34912 for trunk/src/wp-admin/network/themes.php

Timestamp:

10/07/2015 05:11:01 PM (11 years ago)

Author:

jeremyfelt

Message:

Revert [34778], continue using _site_option() for the current network.

The _network_option() parameter order will be changing to accept $network_id first. The _site_option() functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

File:

• trunk/src/wp-admin/network/themes.php (modified) (4 diffs)

trunk/src/wp-admin/network/themes.php

@@ -30 +30 @@
 
 if ( $action ) {
-        $allowed_themes = get_network_option( 'allowedthemes' );
+        $allowed_themes = get_site_option( 'allowedthemes' );
         switch ( $action ) {
                 case 'enable':
                         check_admin_referer('enable-theme_' . $_GET['theme']);
                         $allowed_themes[ $_GET['theme'] ] = true;
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         if ( false === strpos( $referer, '/network/themes.php' ) )
                                 wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
@@ -44 +44 @@
                         check_admin_referer('disable-theme_' . $_GET['theme']);
                         unset( $allowed_themes[ $_GET['theme'] ] );
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
                         exit;
@@ -56 +56 @@
                         foreach ( (array) $themes as $theme )
                                 $allowed_themes[ $theme ] = true;
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
                         exit;
@@ -68 +68 @@
                         foreach ( (array) $themes as $theme )
                                 unset( $allowed_themes[ $theme ] );
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
                         exit;