Changeset 21414 for trunk/wp-includes/class-wp-theme.php

Timestamp:

08/03/2012 05:51:42 PM (12 years ago)

Author:

ryan

Message:

Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().

Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432

File:

• trunk/wp-includes/class-wp-theme.php (modified) (2 diffs)

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

@@ -1110 +1110 @@
         $current = $blog_id == get_current_blog_id();
 
-        if ( $current )
+        if ( $current ) {
             $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
-        else
-            $allowed_themes[ $blog_id ] = get_blog_option( $blog_id, 'allowedthemes' );
+        } else {
+            switch_to_blog( $blog_id );
+            $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+            restore_current_blog();
+        }
 
         // This is all super old MU back compat joy.
         // 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
         if ( false === $allowed_themes[ $blog_id ] ) {
-            if ( $current )
+            if ( $current ) {
                 $allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
-            else
-                $allowed_themes[ $blog_id ] = get_blog_option( $blog_id, 'allowed_themes' );
+            } else {
+                switch_to_blog( $blog_id );
+                $allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+                restore_current_blog();
+            }
 
             if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
@@ -1140 +1146 @@
                     delete_option( 'allowed_themes' );
                 } else {
-                    update_blog_option( $blog_id, 'allowedthemes', $allowed_themes[ $blog_id ] );
-                    delete_blog_option( $blog_id, 'allowed_themes' );
+                    switch_to_blog( $blog_id );
+                    update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
+                    delete_option( 'allowed_themes' );
+                    restore_current_blog();
                 }
             }