<!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>[13433] trunk/wp-includes/functions.php:
Consistently pass unserialized values to hooks in update_site_option().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13433">13433</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 18:51:37 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consistently pass unserialized values to hooks in update_site_option(). Change add_option() and add_site_option() to do the same. Any plugin using maybe_unserialize() would continue to work as the value would no longer need to be unserialized. fixes <a href="http://trac.wordpress.org/ticket/10788">#10788</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 (13432 => 13433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-26 17:18:59 UTC (rev 13432)
+++ trunk/wp-includes/functions.php 2010-02-26 18:51:37 UTC (rev 13433)
</span><span class="lines">@@ -576,6 +576,7 @@
</span><span class="cx"> if ( false !== get_option( $safe_option ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ $_value = $value;
</ins><span class="cx"> $value = maybe_serialize( $value );
</span><span class="cx"> $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
</span><span class="cx"> do_action( 'add_option', $option, $value );
</span><span class="lines">@@ -599,8 +600,8 @@
</span><span class="cx"> $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 ) );
</span><span class="cx">
</span><span class="cx"> if ( $result ) {
</span><del>- do_action( "add_option_{$option}", $option, $value );
- do_action( 'added_option', $option, $value );
</del><ins>+ do_action( "add_option_{$option}", $option, $_value );
+ do_action( 'added_option', $option, $_value );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -3444,13 +3445,14 @@
</span><span class="cx"> $value = sanitize_option( $option, $value );
</span><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="cx">
</span><ins>+ $_value = $value;
</ins><span class="cx"> $value = maybe_serialize($value);
</span><span class="cx">
</span><span class="cx"> $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_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 );
</del><ins>+ do_action( "add_site_option_{$option}", $option, $_value );
+ do_action( "add_site_option", $option, $_value );
</ins><span class="cx">
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="lines">@@ -3532,8 +3534,10 @@
</span><span class="cx"> $value = sanitize_option( $option, $value );
</span><span class="cx"> wp_cache_set( $cache_key, $value, 'site-options' );
</span><span class="cx">
</span><ins>+ $_value = $value;
</ins><span class="cx"> $value = maybe_serialize( $value );
</span><span class="cx"> $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
</span><ins>+ $value = $_value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $result ) {
</span></span></pre>
</div>
</div>
</body>
</html>