<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11995] trunk/wp-includes/functions.php: Make the (add|get|update)
_site_option functions run the same filters in WP as they do in mu.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11995">11995</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-10-03 21:40:27 +0000 (Sat, 03 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the (add|get|update)_site_option functions run the same filters in WP as they do in mu. Fixes <a href="http://trac.wordpress.org/ticket/10893">#10893</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 (11994 => 11995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-10-03 07:14:44 UTC (rev 11994)
+++ trunk/wp-includes/functions.php 2009-10-03 21:40:27 UTC (rev 11995)
</span><span class="lines">@@ -3158,17 +3158,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_site_option( $key, $default = false, $use_cache = true ) {
</span><del>- return get_option($key, $default);
</del><ins>+ // Allow plugins to short-circuit site options.
+ $pre = apply_filters( 'pre_site_option_' . $key, false );
+ if ( false !== $pre )
+ return $pre;
+
+ $value = get_option($key, $default);
+
+ return apply_filters( 'site_option_' . $key, $value );
</ins><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><del>- return add_option($key, $value);
</del><ins>+ $value = apply_filters( 'pre_add_site_option_' . $key, $value );
+ $result = add_option($key, $value);
+ do_action( "add_site_option_{$key}", $key, $value );
+ return $result;
</ins><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><del>- return update_option($key, $value);
</del><ins>+ $oldvalue = get_site_option( $key );
+ $value = apply_filters( 'pre_update_site_option_' . $key, $value, $oldvalue );
+ $result = update_option($key, $value);
+ do_action( "update_site_option_{$key}", $key, $value );
+ return $result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>