<!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" />
<title>[21979] trunk/wp-includes/ms-blogs.php: * Invalidate the get_id_from_blogname_* cache in refresh_blog_details()</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21979">21979</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-09-24 19:31:37 +0000 (Mon, 24 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Invalidate the get_id_from_blogname_* cache in refresh_blog_details()
* Change $name to $slug in get_id_from_blogname() for some semblance of clarity.
* Strip leading and trailing slashes from the slug in get_id_from_blogname() so get_blog_details()->path can be passed directly.
Props wonderboymusic
see <a href="http://core.trac.wordpress.org/ticket/20950">#20950</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (21978 => 21979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2012-09-24 19:16:53 UTC (rev 21978)
+++ trunk/wp-includes/ms-blogs.php 2012-09-24 19:31:37 UTC (rev 21979)
</span><span class="lines">@@ -84,28 +84,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Given a blog's (subdomain or directory) name, retrieve it's id.
</del><ins>+ * Given a blog's (subdomain or directory) slug, retrieve it's id.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><del>- * @param string $name
</del><ins>+ * @param string $slug
</ins><span class="cx"> * @return int A blog id
</span><span class="cx"> */
</span><del>-function get_id_from_blogname( $name ) {
</del><ins>+function get_id_from_blogname( $slug ) {
</ins><span class="cx"> global $wpdb, $current_site;
</span><del>- $blog_id = wp_cache_get( 'get_id_from_blogname_' . $name, 'blog-details' );
</del><ins>+
+ $slug = trim( $slug, '/' );
+
+ $blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
</ins><span class="cx"> if ( $blog_id )
</span><span class="cx"> return $blog_id;
</span><span class="cx">
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><del>- $domain = $name . '.' . $current_site->domain;
</del><ins>+ $domain = $slug . '.' . $current_site->domain;
</ins><span class="cx"> $path = $current_site->path;
</span><span class="cx"> } else {
</span><span class="cx"> $domain = $current_site->domain;
</span><del>- $path = $current_site->path . $name . '/';
</del><ins>+ $path = $current_site->path . $slug . '/';
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
</span><del>- wp_cache_set( 'get_id_from_blogname_' . $name, $blog_id, 'blog-details' );
</del><ins>+ wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
</ins><span class="cx"> return $blog_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,7 +118,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><del>- * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
</del><ins>+ * @param int|string|array $fields A blog ID, a blog slug, 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><span class="lines">@@ -254,6 +258,7 @@
</span><span class="cx"> wp_cache_delete( md5( $details->domain . $details->path ) , 'blog-lookup' );
</span><span class="cx"> wp_cache_delete( 'current_blog_' . $details->domain, 'site-options' );
</span><span class="cx"> wp_cache_delete( 'current_blog_' . $details->domain . $details->path, 'site-options' );
</span><ins>+ wp_cache_delete( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' );
</ins><span class="cx">
</span><span class="cx"> do_action( 'refresh_blog_details', $blog_id );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>