<!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>[12479] trunk/wp-includes/capabilities.php: Ensure we don'
t destory the $wp_roles->
role_objects property when assigning a second role to a WP_User object.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12479">12479</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-22 11:42:46 +0000 (Tue, 22 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure we don't destory the $wp_roles->role_objects property when assigning a second role to a WP_User object. Fixes <a href="http://trac.wordpress.org/ticket/9128">#9128</a> props dd32.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.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 (12478 => 12479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2009-12-21 23:55:23 UTC (rev 12478)
+++ trunk/wp-includes/capabilities.php 2009-12-22 11:42:46 UTC (rev 12479)
</span><span class="lines">@@ -97,8 +97,7 @@
</span><span class="cx"> * @global array $wp_user_roles Used to set the 'roles' property value.
</span><span class="cx"> */
</span><span class="cx"> function _init () {
</span><del>- global $wpdb;
- global $wp_user_roles;
</del><ins>+ global $wpdb, $wp_user_roles;
</ins><span class="cx"> $this->role_key = $wpdb->prefix . 'user_roles';
</span><span class="cx"> if ( ! empty( $wp_user_roles ) ) {
</span><span class="cx"> $this->roles = $wp_user_roles;
</span><span class="lines">@@ -545,8 +544,8 @@
</span><span class="cx"> //Build $allcaps from role caps, overlay user's $caps
</span><span class="cx"> $this->allcaps = array();
</span><span class="cx"> foreach ( (array) $this->roles as $role ) {
</span><del>- $role =& $wp_roles->get_role( $role );
- $this->allcaps = array_merge( (array) $this->allcaps, (array) $role->capabilities );
</del><ins>+ $the_role =& $wp_roles->get_role( $role );
+ $this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
</ins><span class="cx"> }
</span><span class="cx"> $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
</span><span class="cx"> }
</span><span class="lines">@@ -652,7 +651,7 @@
</span><span class="cx"> function update_user_level_from_caps() {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $this->user_level = array_reduce( array_keys( $this->allcaps ), array( &$this, 'level_reduction' ), 0 );
</span><del>- update_usermeta( $this->ID, $wpdb->prefix.'user_level', $this->user_level );
</del><ins>+ update_usermeta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -678,7 +677,8 @@
</span><span class="cx"> * @param string $cap Capability name.
</span><span class="cx"> */
</span><span class="cx"> function remove_cap( $cap ) {
</span><del>- if ( empty( $this->caps[$cap] ) ) return;
</del><ins>+ if ( empty( $this->caps[$cap] ) )
+ return;
</ins><span class="cx"> unset( $this->caps[$cap] );
</span><span class="cx"> update_usermeta( $this->ID, $this->cap_key, $this->caps );
</span><span class="cx"> }
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $this->caps = array();
</span><span class="cx"> update_usermeta( $this->ID, $this->cap_key, '' );
</span><del>- update_usermeta( $this->ID, $wpdb->prefix.'user_level', '' );
</del><ins>+ update_usermeta( $this->ID, $wpdb->prefix . 'user_level', '' );
</ins><span class="cx"> $this->get_role_caps();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> return call_user_func_array( 'map_meta_cap', $args );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ('' != $post->post_author) {
</del><ins>+ if ( '' != $post->post_author ) {
</ins><span class="cx"> $post_author_data = get_userdata( $post->post_author );
</span><span class="cx"> } else {
</span><span class="cx"> //No author set yet so default to current user for cap checks
</span></span></pre>
</div>
</div>
</body>
</html>