<!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>[18587] trunk/wp-includes/functions.php: add_site_option should not update existing options, should return a boolean and should only run actions on success.</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/18587">18587</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2011-08-23 20:24:35 +0000 (Tue, 23 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>add_site_option should not update existing options, should return a boolean and should only run actions on success. fixes <a href="http://core.trac.wordpress.org/ticket/18422">#18422</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 (18586 => 18587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2011-08-23 15:56:14 UTC (rev 18586)
+++ trunk/wp-includes/functions.php 2011-08-23 20:24:35 UTC (rev 18587)
</span><span class="lines">@@ -569,11 +569,10 @@
</span><span class="cx"> * it will be serialized before it is inserted into the database. Remember,
</span><span class="cx"> * resources can not be serialized or added as an option.
</span><span class="cx"> *
</span><del>- * You can create options without values and then add values later. Does not
- * check whether the option has already been added, but does check that you
</del><ins>+ * You can create options without values and then update the values later.
+ * Existing options will not be updated and checks are performed to ensure that you
</ins><span class="cx"> * aren't adding a protected WordPress option. Care should be taken to not name
</span><del>- * options the same as the ones which are protected and to not add options
- * that were already added.
</del><ins>+ * options the same as the ones which are protected.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Option
</span><span class="lines">@@ -3775,6 +3774,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add a new site option.
</span><span class="cx"> *
</span><ins>+ * Existing options will not be updated. Note that prior to 3.3 this wasn't the case.
+ *
</ins><span class="cx"> * @see add_option()
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Option
</span><span class="lines">@@ -3799,7 +3800,7 @@
</span><span class="cx"> $cache_key = "{$wpdb->siteid}:$option";
</span><span class="cx">
</span><span class="cx"> if ( $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ) )
</span><del>- return update_site_option( $option, $value );
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> $value = sanitize_option( $option, $value );
</span><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="lines">@@ -3810,10 +3811,12 @@
</span><span class="cx"> $value = $_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- do_action( "add_site_option_{$option}", $option, $value );
- do_action( "add_site_option", $option, $value );
-
- return $result;
</del><ins>+ if ( $result ) {
+ do_action( "add_site_option_{$option}", $option, $value );
+ do_action( "add_site_option", $option, $value );
+ return true;
+ }
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>