<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13126] trunk: Add ability to query by domain and/
or path to get_blog_details().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13126">13126</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-13 23:09:54 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ability to query by domain and/or path to get_blog_details(). Improve blog details caching. Use get_blog_details() in ms-settings.php so queries are cached. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesblogsphp">trunk/wp-includes/blogs.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/blogs.php (13125 => 13126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/blogs.php 2010-02-13 22:35:11 UTC (rev 13125)
+++ trunk/wp-includes/blogs.php 2010-02-13 23:09:54 UTC (rev 13126)
</span><span class="lines">@@ -74,15 +74,49 @@
</span><span class="cx"> * Retrieve the details for a blog from the blogs table and blog options.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0
</span><del>- * @param int $blog_id Blog ID
</del><ins>+ * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
</ins><span class="cx"> * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
</span><span class="cx"> * @return object Blog details.
</span><span class="cx"> */
</span><del>-function get_blog_details( $blog_id, $get_all = true ) {
</del><ins>+function get_blog_details( $fields, $get_all = true ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( !is_numeric( $blog_id ) )
- $blog_id = get_id_from_blogname( $blog_id );
</del><ins>+ if ( is_array($fields ) ) {
+ if ( isset($fields['blog_id']) ) {
+ $blog_id = $fields['blog_id'];
+ } elseif ( isset($fields['domain']) && isset($fields['path']) ) {
+ $key = md5( $fields['domain'] . $fields['path'] );
+ $blog = wp_cache_get($key, 'blog-lookup');
+ if ( false !== $blog )
+ return $blog;
+ $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+ if ( $blog ) {
+ wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+ $blog_id = $blog->blog_id;
+ } else {
+ return false;
+ }
+ } elseif ( isset($fields['domain']) && is_subdomain_install() ) {
+ $key = md5( $fields['domain'] );
+ $blog = wp_cache_get($key, 'blog-lookup');
+ if ( false !== $blog )
+ return $blog;
+ $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+ if ( $blog ) {
+ wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+ $blog_id = $blog->blog_id;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ } else {
+ if ( !is_numeric( $fields ) )
+ $blog_id = get_id_from_blogname( $fields );
+ else
+ $blog_id = $fields;
+ }
</ins><span class="cx">
</span><span class="cx"> $blog_id = (int) $blog_id;
</span><span class="cx">
</span><span class="lines">@@ -100,12 +134,33 @@
</span><span class="cx"> return $details;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
- if ( ! $details ) {
- wp_cache_set( $blog_id . $all, -1, 'blog-details' );
- return false;
</del><ins>+ // Try the other cache.
+ if ( $get_all ) {
+ $details = wp_cache_get( $blog_id . 'short', 'blog-details' );
+ } else {
+ $details = wp_cache_get( $blog_id, 'blog-details' );
+ // If short was requested and full cache is set, we can return.
+ if ( $details ) {
+ if ( ! is_object( $details ) ) {
+ if ( $details == -1 )
+ return false;
+ else
+ // Clear old pre-serialized objects. Cache clients do better with that.
+ wp_cache_delete( $blog_id . $all, 'blog-details' );
+ }
+ return $details;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( !$details ) {
+ $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
+ if ( ! $details ) {
+ // Set the full cache.
+ wp_cache_set( $blog_id, -1, 'blog-details' );
+ return false;
+ }
+ }
+
</ins><span class="cx"> if ( ! $get_all ) {
</span><span class="cx"> wp_cache_set( $blog_id . $all, $details, 'blog-details' );
</span><span class="cx"> return $details;
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13125 => 13126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-02-13 22:35:11 UTC (rev 13125)
+++ trunk/wp-includes/ms-settings.php 2010-02-13 23:09:54 UTC (rev 13126)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><span class="cx"> $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
</span><span class="cx"> if ( !$current_blog ) {
</span><del>- $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain ) );
</del><ins>+ $current_blog = get_blog_details( array('domain' => $domain), false );
</ins><span class="cx"> if ( $current_blog )
</span><span class="cx"> wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
</span><span class="cx"> }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> $path .= $blogname . '/';
</span><span class="cx"> $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
</span><span class="cx"> if ( ! $current_blog ) {
</span><del>- $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path ) );
</del><ins>+ $current_blog = $current_blog = get_blog_details( array('domain' => $domain, 'path' => $path ), false );
</ins><span class="cx"> if ( $current_blog )
</span><span class="cx"> wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
</span><span class="cx"> }
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> header( 'Location: http://' . $current_site->domain . $current_site->path );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><del>- $current_blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
</del><ins>+ $current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
</ins><span class="cx"> }
</span><span class="cx"> if ( ! $current_blog || ! $current_site )
</span><span class="cx"> is_installed();
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13125 => 13126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-13 22:35:11 UTC (rev 13125)
+++ trunk/wp-settings.php 2010-02-13 23:09:54 UTC (rev 13126)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> // Define WP_LANG_DIR if not set.
</span><span class="cx"> wp_set_lang_dir();
</span><span class="cx">
</span><del>-// Include early WordPress files.
</del><ins>+// Load early WordPress files.
</ins><span class="cx"> require( ABSPATH . WPINC . '/compat.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/functions.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/classes.php' );
</span><span class="lines">@@ -73,17 +73,17 @@
</span><span class="cx"> // Start the WordPress object cache, or an external object cache if the drop-in is present.
</span><span class="cx"> wp_start_object_cache();
</span><span class="cx">
</span><ins>+// Load early WordPress files.
+require( ABSPATH . WPINC . '/plugin.php' );
+require( ABSPATH . WPINC . '/default-filters.php' );
+include_once( ABSPATH . WPINC . '/pomo/mo.php' );
+
</ins><span class="cx"> // Initialize multisite if enabled.
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> require( ABSPATH . WPINC . '/blogs.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/ms-settings.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Load early WordPress files.
-require( ABSPATH . WPINC . '/plugin.php' );
-require( ABSPATH . WPINC . '/default-filters.php' );
-include_once( ABSPATH . WPINC . '/pomo/mo.php' );
-
</del><span class="cx"> // Stop most of WordPress from being loaded if we just want the basics.
</span><span class="cx"> if ( SHORTINIT )
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>