<!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>[13220] trunk/wp-includes/user.php: Update get_user_option()'
s PHPDoc Comment to remove mentions of blog options.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13220">13220</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-19 10:49:07 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update get_user_option()'s PHPDoc Comment to remove mentions of blog options. See <a href="http://trac.wordpress.org/ticket/11615">#11615</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (13219 => 13220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-02-19 10:45:29 UTC (rev 13219)
+++ trunk/wp-includes/user.php 2010-02-19 10:49:07 UTC (rev 13220)
</span><span class="lines">@@ -206,16 +206,14 @@
</span><span class="cx"> //
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve user option that can be either global, user, or blog.
</del><ins>+ * Retrieve user option that can be either per Site or per Network.
</ins><span class="cx"> *
</span><span class="cx"> * If the user ID is not given, then the current user will be used instead. If
</span><span class="cx"> * the user ID is given, then the user data will be retrieved. The filter for
</span><span class="cx"> * the result, will also pass the original option name and finally the user data
</span><span class="cx"> * object as the third parameter.
</span><span class="cx"> *
</span><del>- * The option will first check for the non-global name, then the global name,
- * and if it still doesn't find it, it will try the blog option. The option can
- * either be modified or set by a plugin.
</del><ins>+ * The option will first check for the per site name and then the per Network name.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> * @uses $wpdb WordPress database object for queries.
</span><span class="lines">@@ -764,4 +762,4 @@
</span><span class="cx"> wp_cache_delete($user->user_nicename, 'userslugs');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>