Changeset 21414 for trunk/wp-includes/class-wp-xmlrpc-server.php

Timestamp:

08/03/2012 05:51:42 PM (13 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-xmlrpc-server.php (modified) (1 diff)

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -476 +476 @@
             $is_admin = current_user_can_for_blog( $blog_id, 'manage_options' );
 
+            switch_to_blog( $blog_id );
             $struct[] = array(
                 'isAdmin'       => $is_admin,
-                'url'           => get_home_url( $blog_id, '/' ),
+                'url'           => home_url( '/' ),
                 'blogid'        => (string) $blog_id,
-                'blogName'      => get_blog_option( $blog_id, 'blogname' ),
-                'xmlrpc'        => get_site_url( $blog_id, 'xmlrpc.php' )
+                'blogName'      => get_option( 'blogname' ),
+                'xmlrpc'        => site_url( 'xmlrpc.php' )
             );
+            restore_current_blog();
         }