<!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>[22092] trunk: * Register blog-id-cache group as global</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/22092">22092</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-01 18:03:23 +0000 (Mon, 01 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Register blog-id-cache group as global
* Introduce clean_blog_cache() so we can run it independently of refresh_blog_details() which assumes the blog still exists and get_blog_details() can be called.
* Don't db escape cache keys in get_blog_id_from_url()
* prepare() the query in get_blog_id_from_url()
* Return 0 for all failures in get_blog_id_from_url()
* clean_blog_cache() after dropping tables in wpmu_delete_blog() to make sure the cache is for real cleaned.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (22091 => 22092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-10-01 16:09:16 UTC (rev 22091)
+++ trunk/wp-admin/includes/ms.php 2012-10-01 18:03:23 UTC (rev 22092)
</span><span class="lines">@@ -55,14 +55,13 @@
</span><span class="cx"> global $wpdb, $current_site;
</span><span class="cx">
</span><span class="cx"> $switch = false;
</span><del>- if ( $blog_id != $wpdb->blogid ) {
</del><ins>+ if ( get_current_blog_id() != $blog_id ) {
</ins><span class="cx"> $switch = true;
</span><span class="cx"> switch_to_blog( $blog_id );
</span><del>- $blog = get_blog_details( $blog_id );
- } else {
- $blog = $GLOBALS['current_blog'];
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ $blog = get_blog_details( $blog_id );
+
</ins><span class="cx"> do_action( 'delete_blog', $blog_id, $drop );
</span><span class="cx">
</span><span class="cx"> $users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
</span><span class="lines">@@ -81,7 +80,6 @@
</span><span class="cx"> $drop = false;
</span><span class="cx">
</span><span class="cx"> if ( $drop ) {
</span><del>-
</del><span class="cx"> $drop_tables = apply_filters( 'wpmu_drop_tables', $wpdb->tables( 'blog' ) );
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $drop_tables as $table ) {
</span><span class="lines">@@ -122,6 +120,8 @@
</span><span class="cx"> if ( $dir != $top_dir)
</span><span class="cx"> @rmdir( $dir );
</span><span class="cx"> }
</span><ins>+
+ clean_blog_cache( $blog );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $switch )
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (22091 => 22092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2012-10-01 16:09:16 UTC (rev 22091)
+++ trunk/wp-includes/load.php 2012-10-01 18:03:23 UTC (rev 22092)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> wp_cache_init();
</span><span class="cx">
</span><span class="cx"> if ( function_exists( 'wp_cache_add_global_groups' ) ) {
</span><del>- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
</del><ins>+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
</ins><span class="cx"> wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (22091 => 22092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2012-10-01 16:09:16 UTC (rev 22091)
+++ trunk/wp-includes/ms-blogs.php 2012-10-01 18:03:23 UTC (rev 22092)
</span><span class="lines">@@ -253,12 +253,7 @@
</span><span class="cx"> $blog_id = (int) $blog_id;
</span><span class="cx"> $details = get_blog_details( $blog_id, false );
</span><span class="cx">
</span><del>- wp_cache_delete( $blog_id , 'blog-details' );
- wp_cache_delete( $blog_id . 'short' , 'blog-details' );
- wp_cache_delete( md5( $details->domain . $details->path ) , 'blog-lookup' );
- wp_cache_delete( 'current_blog_' . $details->domain, 'site-options' );
- wp_cache_delete( 'current_blog_' . $details->domain . $details->path, 'site-options' );
- wp_cache_delete( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' );
</del><ins>+ clean_blog_cache( $details );
</ins><span class="cx">
</span><span class="cx"> do_action( 'refresh_blog_details', $blog_id );
</span><span class="cx"> }
</span><span class="lines">@@ -317,6 +312,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Clean the blog cache
+ *
+ * @since 3.5.0
+ *
+ * @param stdClass $blog The blog details as returned from get_blog_details()
+ */
+function clean_blog_cache( $blog ) {
+ $blog_id = $blog->blog_id;
+ $domain_path_key = md5( $blog->domain . $blog->path );
+
+ wp_cache_delete( $blog_id , 'blog-details' );
+ wp_cache_delete( $blog_id . 'short' , 'blog-details' );
+ wp_cache_delete( $domain_path_key, 'blog-lookup' );
+ wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
+ wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
+ wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
+ wp_cache_delete( $domain_path_key, 'blog-id-cache' );
+}
+
+/**
</ins><span class="cx"> * Retrieve option value for a given blog id based on name of option.
</span><span class="cx"> *
</span><span class="cx"> * If the option does not exist or does not have a value, then the return value
</span><span class="lines">@@ -492,7 +507,7 @@
</span><span class="cx"> if ( is_array( $global_groups ) )
</span><span class="cx"> wp_cache_add_global_groups( $global_groups );
</span><span class="cx"> else
</span><del>- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
</del><ins>+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) );
</ins><span class="cx"> wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -553,7 +568,7 @@
</span><span class="cx"> if ( is_array( $global_groups ) )
</span><span class="cx"> wp_cache_add_global_groups( $global_groups );
</span><span class="cx"> else
</span><del>- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
</del><ins>+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) );
</ins><span class="cx"> wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (22091 => 22092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2012-10-01 16:09:16 UTC (rev 22091)
+++ trunk/wp-includes/ms-functions.php 2012-10-01 18:03:23 UTC (rev 22092)
</span><span class="lines">@@ -332,27 +332,27 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $domain
</span><span class="cx"> * @param string $path Optional. Not required for subdomain installations.
</span><del>- * @return int
</del><ins>+ * @return int 0 if no blog found, otherwise the ID of the matching blog
</ins><span class="cx"> */
</span><span class="cx"> function get_blog_id_from_url( $domain, $path = '/' ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- $domain = strtolower( $wpdb->escape( $domain ) );
- $path = strtolower( $wpdb->escape( $path ) );
</del><ins>+ $domain = strtolower( $domain );
+ $path = strtolower( $path );
</ins><span class="cx"> $id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
</span><span class="cx">
</span><del>- if ( $id == -1 ) { // blog does not exist
</del><ins>+ if ( $id == -1 ) // blog does not exist
</ins><span class="cx"> return 0;
</span><del>- } elseif ( $id ) {
- return (int)$id;
- }
</del><ins>+ elseif ( $id )
+ return (int) $id;
</ins><span class="cx">
</span><del>- $id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs WHERE domain = '$domain' and path = '$path' /* get_blog_id_from_url */" );
</del><ins>+ $id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
</ins><span class="cx">
</span><del>- if ( !$id ) {
</del><ins>+ if ( ! $id ) {
</ins><span class="cx"> wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
</span><del>- return false;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
</span><span class="cx">
</span><span class="cx"> return $id;
</span></span></pre>
</div>
</div>
</body>
</html>