From 5f1b0c2a4b185fe9856aea6dff84ed3f251d599b Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 30 Jun 2012 11:49:02 +0000 Subject: [PATCH] Don't use switch_to_blog() in wp.getUsersBlogs to improve performance and memory footprint. props mohanjith for initial patch. fixes #20665. git-svn-id: https://develop.svn.wordpress.org/trunk@21194 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/class-wp-xmlrpc-server.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index e542bbac15..b65e4fbc35 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -473,18 +473,15 @@ class wp_xmlrpc_server extends IXR_Server { continue; $blog_id = $blog->userblog_id; - switch_to_blog($blog_id); - $is_admin = current_user_can('manage_options'); + $is_admin = current_user_can_for_blog( $blog_id, 'manage_options' ); $struct[] = array( 'isAdmin' => $is_admin, - 'url' => get_option( 'home' ) . '/', + 'url' => get_home_url( $blog_id, '/' ), 'blogid' => (string) $blog_id, - 'blogName' => get_option( 'blogname' ), - 'xmlrpc' => site_url( 'xmlrpc.php' ) + 'blogName' => get_blog_option( $blog_id, 'blogname' ), + 'xmlrpc' => get_site_url( $blog_id, 'xmlrpc.php' ) ); - - restore_current_blog(); } return $struct;