<!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>[13883] trunk: delete user cap in remove_all_caps(), props ocean90,
see #12711</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13883">13883</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-29 20:35:06 +0000 (Mon, 29 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>delete user cap in remove_all_caps(), props ocean90, see <a href="http://trac.wordpress.org/ticket/12711">#12711</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (13882 => 13883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-03-29 20:25:30 UTC (rev 13882)
+++ trunk/wp-admin/users.php 2010-03-29 20:35:06 UTC (rev 13883)
</span><span class="lines">@@ -368,9 +368,10 @@
</span><span class="cx"> $user_object = new WP_User($userid);
</span><span class="cx"> $roles = $user_object->roles;
</span><span class="cx"> $role = array_shift($roles);
</span><del>-
- $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
- echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
</del><ins>+ if ( is_multisite() && ! empty($role) ) {
+ $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
+ echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
+ }
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </tbody>
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (13882 => 13883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-03-29 20:25:30 UTC (rev 13882)
+++ trunk/wp-includes/capabilities.php 2010-03-29 20:35:06 UTC (rev 13883)
</span><span class="lines">@@ -698,8 +698,8 @@
</span><span class="cx"> function remove_all_caps() {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $this->caps = array();
</span><del>- update_user_meta( $this->ID, $this->cap_key, '' );
- update_user_meta( $this->ID, $wpdb->prefix . 'user_level', '' );
</del><ins>+ delete_user_meta( $this->ID, $this->cap_key );
+ delete_user_meta( $this->ID, $wpdb->prefix . 'user_level' );
</ins><span class="cx"> $this->get_role_caps();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>