<!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>[21563] trunk/wp-includes: Move the optimization done to get_user_by() in [21376] higher up the stack, into map_meta_cap() and is_super_admin().</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/21563">21563</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-08-20 21:58:34 +0000 (Mon, 20 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the optimization done to get_user_by() in <a href="http://core.trac.wordpress.org/changeset/21376">[21376]</a> higher up the stack, into map_meta_cap() and is_super_admin().
This provides nearly the same benefits without possibly receiving a stale object from get_userdata(),
which could affect authentication, and introduce side effects for plugins.
see <a href="http://core.trac.wordpress.org/ticket/21120">#21120</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (21562 => 21563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2012-08-20 21:44:38 UTC (rev 21562)
+++ trunk/wp-includes/capabilities.php 2012-08-20 21:58:34 UTC (rev 21563)
</span><span class="lines">@@ -1016,13 +1016,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( '' != $post->post_author ) {
- $post_author_data = get_userdata( $post->post_author );
- } else {
- // No author set yet, so default to current user for cap checks.
- $post_author_data = get_userdata( $user_id );
- }
</del><ins>+ $post_author_id = $post->post_author;
</ins><span class="cx">
</span><ins>+ // If no author set yet, default to current user for cap checks.
+ if ( ! $post_author_id )
+ $post_author_id = $user_id;
+
+ $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
+
</ins><span class="cx"> // If the user is the author...
</span><span class="cx"> if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) {
</span><span class="cx"> // If the post is published...
</span><span class="lines">@@ -1065,14 +1066,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( '' != $post->post_author ) {
- $post_author_data = get_userdata( $post->post_author );
- } else {
- // No author set yet, so default to current user for cap checks.
- $post_author_data = get_userdata( $user_id );
- }
</del><ins>+ $post_author_id = $post->post_author;
</ins><span class="cx">
</span><del>- //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
</del><ins>+ // If no author set yet, default to current user for cap checks.
+ if ( ! $post_author_id )
+ $post_author_id = $user_id;
+
+ $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
+
</ins><span class="cx"> // If the user is the author...
</span><span class="cx"> if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) {
</span><span class="cx"> // If the post is published...
</span><span class="lines">@@ -1119,13 +1120,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( '' != $post->post_author ) {
- $post_author_data = get_userdata( $post->post_author );
- } else {
- // No author set yet, so default to current user for cap checks.
- $post_author_data = get_userdata( $user_id );
- }
</del><ins>+ $post_author_id = $post->post_author;
</ins><span class="cx">
</span><ins>+ // If no author set yet, default to current user for cap checks.
+ if ( ! $post_author_id )
+ $post_author_id = $user_id;
+
+ $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
+
</ins><span class="cx"> if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID )
</span><span class="cx"> $caps[] = $post_type->cap->read;
</span><span class="cx"> elseif ( $status_obj->private )
</span><span class="lines">@@ -1423,10 +1425,12 @@
</span><span class="cx"> * @return bool True if the user is a site admin.
</span><span class="cx"> */
</span><span class="cx"> function is_super_admin( $user_id = false ) {
</span><del>- if ( ! $user_id )
- $user_id = get_current_user_id();
</del><ins>+ if ( ! $user_id || $user_id == get_current_user_id() )
+ $user = wp_get_current_user();
+ else
+ $user = get_userdata( $user_id );
</ins><span class="cx">
</span><del>- if ( ! $user = get_userdata( $user_id ) )
</del><ins>+ if ( ! $user || ! $user->exists() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (21562 => 21563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2012-08-20 21:44:38 UTC (rev 21562)
+++ trunk/wp-includes/pluggable.php 2012-08-20 21:58:34 UTC (rev 21563)
</span><span class="lines">@@ -133,9 +133,6 @@
</span><span class="cx"> * @return bool|object False on failure, WP_User object on success
</span><span class="cx"> */
</span><span class="cx"> function get_user_by( $field, $value ) {
</span><del>- if ( 'id' === $field && (int) $value && get_current_user_id() === (int) $value )
- return wp_get_current_user();
-
</del><span class="cx"> $userdata = WP_User::get_data_by( $field, $value );
</span><span class="cx">
</span><span class="cx"> if ( !$userdata )
</span></span></pre>
</div>
</div>
</body>
</html>