<!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>[26304] trunk: Prefix the `notoptions` cache key in the multisite `site-options` group with `$wpdb->siteid` to avoid collisions and race conditions when using a fancy multi-network setup.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/26304">26304</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-11-21 19:06:26 +0000 (Thu, 21 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prefix the `notoptions` cache key in the multisite `site-options` group with `$wpdb->siteid` to avoid collisions and race conditions when using a fancy multi-network setup. Adds unit test.
Fixes <a href="http://core.trac.wordpress.org/ticket/25883">#25883</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunktestsphpunittestsoptionsiteOptionphp">trunk/tests/phpunit/tests/option/siteOption.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/option.php (26303 => 26304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/option.php 2013-11-21 09:45:22 UTC (rev 26303)
+++ trunk/src/wp-includes/option.php 2013-11-21 19:06:26 UTC (rev 26304)
</span><span class="lines">@@ -757,7 +757,8 @@
</span><span class="cx"> return $pre;
</span><span class="cx">
</span><span class="cx"> // prevent non-existent options from triggering multiple queries
</span><del>- $notoptions = wp_cache_get( 'notoptions', 'site-options' );
</del><ins>+ $notoptions_key = "{$wpdb->siteid}:notoptions";
+ $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
</ins><span class="cx"> if ( isset( $notoptions[$option] ) )
</span><span class="cx"> return apply_filters( 'default_site_option_' . $option, $default );
</span><span class="cx">
</span><span class="lines">@@ -779,7 +780,7 @@
</span><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="cx"> } else {
</span><span class="cx"> $notoptions[$option] = true;
</span><del>- wp_cache_set( 'notoptions', $notoptions, 'site-options' );
</del><ins>+ wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
</ins><span class="cx"> $value = apply_filters( 'default_site_option_' . $option, $default );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -812,6 +813,7 @@
</span><span class="cx"> wp_protect_special_option( $option );
</span><span class="cx">
</span><span class="cx"> $value = apply_filters( 'pre_add_site_option_' . $option, $value );
</span><ins>+ $notoptions_key = "{$wpdb->siteid}:notoptions";
</ins><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $result = add_option( $option, $value );
</span><span class="lines">@@ -819,7 +821,7 @@
</span><span class="cx"> $cache_key = "{$wpdb->siteid}:$option";
</span><span class="cx">
</span><span class="cx"> // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
</span><del>- $notoptions = wp_cache_get( 'notoptions', 'site-options' );
</del><ins>+ $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
</ins><span class="cx"> if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
</span><span class="cx"> if ( false !== get_site_option( $option ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -835,10 +837,10 @@
</span><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="cx">
</span><span class="cx"> // This option exists now
</span><del>- $notoptions = wp_cache_get( 'notoptions', 'site-options' ); // yes, again... we need it to be fresh
</del><ins>+ $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh
</ins><span class="cx"> if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
</span><span class="cx"> unset( $notoptions[$option] );
</span><del>- wp_cache_set( 'notoptions', $notoptions, 'site-options' );
</del><ins>+ wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -922,10 +924,11 @@
</span><span class="cx"> if ( false === $old_value )
</span><span class="cx"> return add_site_option( $option, $value );
</span><span class="cx">
</span><del>- $notoptions = wp_cache_get( 'notoptions', 'site-options' );
</del><ins>+ $notoptions_key = "{$wpdb->siteid}:notoptions";
+ $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
</ins><span class="cx"> if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
</span><span class="cx"> unset( $notoptions[$option] );
</span><del>- wp_cache_set( 'notoptions', $notoptions, 'site-options' );
</del><ins>+ wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsiteOptionphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/option/siteOption.php (26303 => 26304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/option/siteOption.php 2013-11-21 09:45:22 UTC (rev 26303)
+++ trunk/tests/phpunit/tests/option/siteOption.php 2013-11-21 19:06:26 UTC (rev 26304)
</span><span class="lines">@@ -90,4 +90,24 @@
</span><span class="cx"> $this->assertEquals( get_site_option( $option, $default ), $default );
</span><span class="cx"> $this->assertFalse( get_site_option( $option ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group multisite
+ */
+ function test_site_notoptions() {
+ global $wpdb;
+ $notoptions_key = "{$wpdb->siteid}:notoptions";
+
+ $_notoptions = wp_cache_get( 'notoptions', 'site-options' );
+ $this->assertEmpty( $_notoptions );
+ $_notoptions1 = wp_cache_get( $notoptions_key, 'site-options' );
+ $this->assertEmpty( $_notoptions1 );
+
+ get_site_option( 'burrito' );
+
+ $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+ $this->assertEmpty( $notoptions );
+ $notoptions1 = wp_cache_get( $notoptions_key, 'site-options' );
+ $this->assertNotEmpty( $notoptions1 );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>