<!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>[12615] trunk/wp-includes/functions.php: Make *_site_option()
multisite awate.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12615">12615</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-06 23:57:35 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make *_site_option() multisite awate. see <a href="http://trac.wordpress.org/ticket/11644">#11644</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 (12614 => 12615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-01-06 23:48:46 UTC (rev 12614)
+++ trunk/wp-includes/functions.php 2010-01-06 23:57:35 UTC (rev 12615)
</span><span class="lines">@@ -3257,36 +3257,112 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_site_option( $key, $default = false, $use_cache = true ) {
</span><ins>+ global $wpdb;
+
</ins><span class="cx"> // Allow plugins to short-circuit site options.
</span><span class="cx"> $pre = apply_filters( 'pre_site_option_' . $key, false );
</span><span class="cx"> if ( false !== $pre )
</span><span class="cx"> return $pre;
</span><span class="cx">
</span><del>- $value = get_option($key, $default);
</del><ins>+ if ( !is_multisite() ) {
+ $value = get_option($key, $default);
+ } else {
+ $cache_key = "{$wpdb->siteid}:$key";
</ins><span class="cx">
</span><ins>+ if ( $use_cache == true && $value = wp_cache_get($cache_key, 'site-options') )
+ return $value;
+
+ $value = $wpdb->get_var( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid) );
+
+ if ( is_null($value) )
+ $value = $default;
+
+ $value = maybe_unserialize( $value );
+
+ wp_cache_set( $cache_key, $value, 'site-options' );
+ }
+
</ins><span class="cx"> return apply_filters( 'site_option_' . $key, $value );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // expects $key, $value not to be SQL escaped
</span><span class="cx"> function add_site_option( $key, $value ) {
</span><ins>+ global $wpdb;
+
</ins><span class="cx"> $value = apply_filters( 'pre_add_site_option_' . $key, $value );
</span><del>- $result = add_option($key, $value);
</del><ins>+
+ if ( !is_multisite() ) {
+ $result = add_option($key, $value);
+ } else {
+ $cache_key = "{$wpdb->siteid}:$key";
+
+ if ( $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid ) ) )
+ return update_site_option( $key, $value );
+
+ $value = sanitize_option( $key, $value );
+ wp_cache_set( $cache_key, $value, 'site-options');
+
+ $value = maybe_serialize($value);
+
+ $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $key, 'meta_value' => $value) );
+ }
+
</ins><span class="cx"> do_action( "add_site_option_{$key}", $key, $value );
</span><ins>+ do_action( "add_site_option", $key, $value );
+
</ins><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function delete_site_option( $key ) {
</span><del>- $result = delete_option($key);
</del><ins>+ global $wpdb;
+
+ //wpmu_protect_special_option( $key ); @todo
+
+ do_action( 'pre_delete_site_option_' . $key );
+
+ if ( !is_multisite() ) {
+ $result = delete_option($key);
+ } else {
+ $option = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid ) );
+ if ( is_null( $option ) || !$option->meta_id )
+ return false;
+ $cache_key = "{$wpdb->siteid}:$key";
+ wp_cache_delete( $cache_key, 'site-options' );
+
+ $result = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid ) );
+ }
+
</ins><span class="cx"> do_action( "delete_site_option_{$key}", $key );
</span><ins>+ do_action( "delete_site_option", $key );
</ins><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // expects $key, $value not to be SQL escaped
</span><span class="cx"> function update_site_option( $key, $value ) {
</span><ins>+ global $wpdb;
+
</ins><span class="cx"> $oldvalue = get_site_option( $key );
</span><span class="cx"> $value = apply_filters( 'pre_update_site_option_' . $key, $value, $oldvalue );
</span><del>- $result = update_option($key, $value);
</del><ins>+
+ if ( $value == $oldvalue )
+ return false;
+
+ if ( !is_multisite() ) {
+ $result = update_option($key, $value);
+ } else {
+ $cache_key = "{$wpdb->siteid}:$key";
+
+ if ( $value && !$wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid) ) )
+ return add_site_option( $key, $value );
+ $value = sanitize_option( $key, $value );
+ wp_cache_set( $cache_key, $value, 'site-options' );
+
+ $value = maybe_serialize($value);
+ $result = $wpdb->update( $wpdb->sitemeta, array('meta_value' => $value), array('site_id' => $wpdb->siteid, 'meta_key' => $key) );
+ }
+
</ins><span class="cx"> do_action( "update_site_option_{$key}", $key, $value );
</span><ins>+ do_action( "update_site_option", $key, $value );
</ins><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>