<!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>[25664] trunk/src/wp-includes/option.php: When queries fail in option functions, bail before setting cache.</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/25664">25664</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-02 20:42:39 +0000 (Wed, 02 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>When queries fail in option functions, bail before setting cache.
Standardize variables so things are less confusing.
fixes <a href="http://core.trac.wordpress.org/ticket/25015">#25015</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.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 (25663 => 25664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/option.php 2013-10-02 20:37:48 UTC (rev 25663)
+++ trunk/src/wp-includes/option.php 2013-10-02 20:42:39 UTC (rev 25664)
</span><span class="lines">@@ -208,10 +208,10 @@
</span><span class="cx"> * @uses do_action() Calls 'update_option_$option' and 'updated_option' hooks on success.
</span><span class="cx"> *
</span><span class="cx"> * @param string $option Option name. Expected to not be SQL-escaped.
</span><del>- * @param mixed $newvalue Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
</del><ins>+ * @param mixed $value Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
</ins><span class="cx"> * @return bool False if value was not updated and true if value was updated.
</span><span class="cx"> */
</span><del>-function update_option( $option, $newvalue ) {
</del><ins>+function update_option( $option, $value ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $option = trim($option);
</span><span class="lines">@@ -220,48 +220,46 @@
</span><span class="cx">
</span><span class="cx"> wp_protect_special_option( $option );
</span><span class="cx">
</span><del>- if ( is_object($newvalue) )
- $newvalue = clone $newvalue;
</del><ins>+ if ( is_object( $value ) )
+ $value = clone $value;
</ins><span class="cx">
</span><del>- $newvalue = sanitize_option( $option, $newvalue );
- $oldvalue = get_option( $option );
- $newvalue = apply_filters( 'pre_update_option_' . $option, $newvalue, $oldvalue );
</del><ins>+ $value = sanitize_option( $option, $value );
+ $old_value = get_option( $option );
+ $value = apply_filters( 'pre_update_option_' . $option, $value, $old_value );
</ins><span class="cx">
</span><span class="cx"> // If the new and old values are the same, no need to update.
</span><del>- if ( $newvalue === $oldvalue )
</del><ins>+ if ( $value === $old_value )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( false === $oldvalue )
- return add_option( $option, $newvalue );
</del><ins>+ if ( false === $old_value )
+ return add_option( $option, $value );
</ins><span class="cx">
</span><ins>+ $serialized_value = maybe_serialize( $value );
+
+ $result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) );
+ if ( ! $result )
+ return false;
+
</ins><span class="cx"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><span class="cx"> if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
</span><span class="cx"> unset( $notoptions[$option] );
</span><span class="cx"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $_newvalue = $newvalue;
- $newvalue = maybe_serialize( $newvalue );
-
- do_action( 'update_option', $option, $oldvalue, $_newvalue );
</del><ins>+ do_action( 'update_option', $option, $old_value, $value );
</ins><span class="cx"> if ( ! defined( 'WP_INSTALLING' ) ) {
</span><span class="cx"> $alloptions = wp_load_alloptions();
</span><span class="cx"> if ( isset( $alloptions[$option] ) ) {
</span><del>- $alloptions[$option] = $newvalue;
</del><ins>+ $alloptions[ $option ] = $serialized_value;
</ins><span class="cx"> wp_cache_set( 'alloptions', $alloptions, 'options' );
</span><span class="cx"> } else {
</span><del>- wp_cache_set( $option, $newvalue, 'options' );
</del><ins>+ wp_cache_set( $option, $serialized_value, 'options' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $result = $wpdb->update( $wpdb->options, array( 'option_value' => $newvalue ), array( 'option_name' => $option ) );
-
- if ( $result ) {
- do_action( "update_option_{$option}", $oldvalue, $_newvalue );
- do_action( 'updated_option', $option, $oldvalue, $_newvalue );
- return true;
- }
- return false;
</del><ins>+ do_action( "update_option_{$option}", $old_value, $value );
+ do_action( 'updated_option', $option, $old_value, $value );
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -312,17 +310,21 @@
</span><span class="cx"> if ( false !== get_option( $option ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $_value = $value;
- $value = maybe_serialize( $value );
</del><ins>+ $serialized_value = maybe_serialize( $value );
</ins><span class="cx"> $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
</span><del>- do_action( 'add_option', $option, $_value );
</del><ins>+ do_action( 'add_option', $option, $value );
+
+ $result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
+ if ( ! $result )
+ return false;
+
</ins><span class="cx"> if ( ! defined( 'WP_INSTALLING' ) ) {
</span><span class="cx"> if ( 'yes' == $autoload ) {
</span><span class="cx"> $alloptions = wp_load_alloptions();
</span><del>- $alloptions[$option] = $value;
</del><ins>+ $alloptions[ $option ] = $serialized_value;
</ins><span class="cx"> wp_cache_set( 'alloptions', $alloptions, 'options' );
</span><span class="cx"> } else {
</span><del>- wp_cache_set( $option, $value, 'options' );
</del><ins>+ wp_cache_set( $option, $serialized_value, 'options' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -333,14 +335,9 @@
</span><span class="cx"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $value, $autoload ) );
-
- if ( $result ) {
- do_action( "add_option_{$option}", $option, $_value );
- do_action( 'added_option', $option, $_value );
- return true;
- }
- return false;
</del><ins>+ do_action( "add_option_{$option}", $option, $value );
+ do_action( 'added_option', $option, $value );
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -829,13 +826,14 @@
</span><span class="cx">
</span><span class="cx"> $value = sanitize_option( $option, $value );
</span><span class="cx">
</span><ins>+ $serialized_value = maybe_serialize( $value );
+ $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
+
+ if ( ! $result )
+ return false;
+
</ins><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="cx">
</span><del>- $_value = $value;
- $value = maybe_serialize( $value );
- $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $value ) );
- $value = $_value;
-
</del><span class="cx"> // This option exists now
</span><span class="cx"> $notoptions = wp_cache_get( 'notoptions', 'site-options' ); // yes, again... we need it to be fresh
</span><span class="cx"> if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
</span><span class="lines">@@ -915,13 +913,13 @@
</span><span class="cx">
</span><span class="cx"> wp_protect_special_option( $option );
</span><span class="cx">
</span><del>- $oldvalue = get_site_option( $option );
- $value = apply_filters( 'pre_update_site_option_' . $option, $value, $oldvalue );
</del><ins>+ $old_value = get_site_option( $option );
+ $value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value );
</ins><span class="cx">
</span><del>- if ( $value === $oldvalue )
</del><ins>+ if ( $value === $old_value )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( false === $oldvalue )
</del><ins>+ if ( false === $old_value )
</ins><span class="cx"> return add_site_option( $option, $value );
</span><span class="cx">
</span><span class="cx"> $notoptions = wp_cache_get( 'notoptions', 'site-options' );
</span><span class="lines">@@ -934,18 +932,19 @@
</span><span class="cx"> $result = update_option( $option, $value );
</span><span class="cx"> } else {
</span><span class="cx"> $value = sanitize_option( $option, $value );
</span><del>- $cache_key = "{$wpdb->siteid}:$option";
- wp_cache_set( $cache_key, $value, 'site-options' );
</del><span class="cx">
</span><del>- $_value = $value;
- $value = maybe_serialize( $value );
- $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
- $value = $_value;
</del><ins>+ $serialized_value = maybe_serialize( $value );
+ $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
+
+ if ( $result ) {
+ $cache_key = "{$wpdb->siteid}:$option";
+ wp_cache_set( $cache_key, $value, 'site-options' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $result ) {
</span><del>- do_action( "update_site_option_{$option}", $option, $value, $oldvalue );
- do_action( "update_site_option", $option, $value, $oldvalue );
</del><ins>+ do_action( "update_site_option_{$option}", $option, $value, $old_value );
+ do_action( "update_site_option", $option, $value, $old_value );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>