<!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>[12973] trunk/wp-includes/functions.php:
Reduce DB queries by half during MU signup, props donncha, see #12140</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12973">12973</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-05 17:59:24 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce DB queries by half during MU signup, props donncha, see <a href="http://trac.wordpress.org/ticket/12140">#12140</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12972 => 12973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-05 17:59:18 UTC (rev 12972)
+++ trunk/wp-includes/functions.php 2010-02-05 17:59:24 UTC (rev 12973)
</span><span class="lines">@@ -335,7 +335,9 @@
</span><span class="cx"> return $default;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $alloptions = wp_load_alloptions();
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ $alloptions = wp_load_alloptions();
+ }
</ins><span class="cx">
</span><span class="cx"> if ( isset( $alloptions[$setting] ) ) {
</span><span class="cx"> $value = $alloptions[$setting];
</span><span class="lines">@@ -495,12 +497,14 @@
</span><span class="cx"> $newvalue = maybe_serialize( $newvalue );
</span><span class="cx">
</span><span class="cx"> do_action( 'update_option', $option_name, $oldvalue, $newvalue );
</span><del>- $alloptions = wp_load_alloptions();
- if ( isset( $alloptions[$option_name] ) ) {
- $alloptions[$option_name] = $newvalue;
- wp_cache_set( 'alloptions', $alloptions, 'options' );
- } else {
- wp_cache_set( $option_name, $newvalue, 'options' );
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ $alloptions = wp_load_alloptions();
+ if ( isset( $alloptions[$option_name] ) ) {
+ $alloptions[$option_name] = $newvalue;
+ wp_cache_set( 'alloptions', $alloptions, 'options' );
+ } else {
+ wp_cache_set( $option_name, $newvalue, 'options' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $wpdb->update($wpdb->options, array('option_value' => $newvalue), array('option_name' => $option_name) );
</span><span class="lines">@@ -560,12 +564,14 @@
</span><span class="cx"> $value = maybe_serialize( $value );
</span><span class="cx"> $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
</span><span class="cx"> do_action( 'add_option', $name, $value );
</span><del>- if ( 'yes' == $autoload ) {
- $alloptions = wp_load_alloptions();
- $alloptions[$name] = $value;
- wp_cache_set( 'alloptions', $alloptions, 'options' );
- } else {
- wp_cache_set( $name, $value, 'options' );
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ if ( 'yes' == $autoload ) {
+ $alloptions = wp_load_alloptions();
+ $alloptions[$name] = $value;
+ wp_cache_set( 'alloptions', $alloptions, 'options' );
+ } else {
+ wp_cache_set( $name, $value, 'options' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This option exists now
</span><span class="lines">@@ -606,14 +612,16 @@
</span><span class="cx"> do_action( 'delete_option', $name );
</span><span class="cx"> // expected_slashed ($name)
</span><span class="cx"> $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
</span><del>- if ( 'yes' == $option->autoload ) {
- $alloptions = wp_load_alloptions();
- if ( isset( $alloptions[$name] ) ) {
- unset( $alloptions[$name] );
- wp_cache_set( 'alloptions', $alloptions, 'options' );
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ if ( 'yes' == $option->autoload ) {
+ $alloptions = wp_load_alloptions();
+ if ( isset( $alloptions[$name] ) ) {
+ unset( $alloptions[$name] );
+ wp_cache_set( 'alloptions', $alloptions, 'options' );
+ }
+ } else {
+ wp_cache_delete( $name, 'options' );
</ins><span class="cx"> }
</span><del>- } else {
- wp_cache_delete( $name, 'options' );
</del><span class="cx"> }
</span><span class="cx"> do_action( 'deleted_option', $name );
</span><span class="cx"> return true;
</span><span class="lines">@@ -665,15 +673,17 @@
</span><span class="cx"> if ( $_wp_using_ext_object_cache ) {
</span><span class="cx"> $value = wp_cache_get($transient, 'transient');
</span><span class="cx"> } else {
</span><del>- $transient_option = '_transient_' . esc_sql($transient);
- // If option is not in alloptions, it is not autoloaded and thus has a timeout
- $alloptions = wp_load_alloptions();
- if ( !isset( $alloptions[$transient_option] ) ) {
- $transient_timeout = '_transient_timeout_' . esc_sql($transient);
- if ( get_option($transient_timeout) < time() ) {
- delete_option($transient_option);
- delete_option($transient_timeout);
- return false;
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ $transient_option = '_transient_' . esc_sql($transient);
+ // If option is not in alloptions, it is not autoloaded and thus has a timeout
+ $alloptions = wp_load_alloptions();
+ if ( !isset( $alloptions[$transient_option] ) ) {
+ $transient_timeout = '_transient_timeout_' . esc_sql($transient);
+ if ( get_option($transient_timeout) < time() ) {
+ delete_option($transient_option);
+ delete_option($transient_timeout);
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1742,7 +1752,9 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> $suppress = $wpdb->suppress_errors();
</span><del>- $alloptions = wp_load_alloptions();
</del><ins>+ if ( ! defined( 'WP_INSTALLING' ) ) {
+ $alloptions = wp_load_alloptions();
+ }
</ins><span class="cx"> // If siteurl is not set to autoload, check it specifically
</span><span class="cx"> if ( !isset( $alloptions['siteurl'] ) )
</span><span class="cx"> $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
</span></span></pre>
</div>
</div>
</body>
</html>