From e14237a1095339b5ee92e39d2f45dc36fbb0370d Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Mon, 24 Mar 2014 01:01:15 +0000 Subject: [PATCH] Multisite load: Cache the main site lookup query. props jeremyfelt. see #27003. Built from https://develop.svn.wordpress.org/trunk@27664 git-svn-id: http://core.svn.wordpress.org/trunk@27507 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php index 3e10ba56fc..892548f5de 100644 --- a/wp-includes/ms-settings.php +++ b/wp-includes/ms-settings.php @@ -172,10 +172,10 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { if ( ! isset( $current_site->blog_id ) ) { if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) { $current_site->blog_id = $current_blog->blog_id; - } else { - // @todo we should be able to cache the blog ID of a network's main site easily. + } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) { $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) ); + wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' ); } }