<!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>[12770] trunk: Use API to set the user's role.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12770">12770</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-19 20:12:04 +0000 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use API to set the user's role. see <a href="http://trac.wordpress.org/ticket/11781">#11781</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12769 => 12770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php        2010-01-19 20:03:11 UTC (rev 12769)
+++ trunk/wp-admin/ms-edit.php        2010-01-19 20:12:04 UTC (rev 12770)
</span><span class="lines">@@ -235,12 +235,12 @@
</span><span class="cx">                         $newroles = $_POST[ 'role' ];
</span><span class="cx">                         reset( $newroles );
</span><span class="cx">                         foreach ( (array) $newroles as $userid => $role ) {
</span><del>-                                $role_len = strlen( $role );
-                                $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid' AND meta_key = '" . $blog_prefix. "capabilities'" );
-                                if ( false == $existing_role )
-                                        $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $blog_prefix . "capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" );
-                                elseif ( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" )
-                                        $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid' AND meta_key = '" . $blog_prefix . "capabilities'" );
</del><ins>+                                $user = new WP_User($userid);
+                                if ( ! $user )
+                                        continue;
+                                // Hack. Init user caps for given blog.
+                                $user->_init_caps($blog_prefix . 'capabilities');
+                                $user->set_role($role);
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (12769 => 12770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php        2010-01-19 20:03:11 UTC (rev 12769)
+++ trunk/wp-includes/capabilities.php        2010-01-19 20:12:04 UTC (rev 12770)
</span><span class="lines">@@ -508,11 +508,16 @@
</span><span class="cx">          * used.
</span><span class="cx">          *
</span><span class="cx">          * @since 2.1.0
</span><ins>+         *
+         * @param string $cap_key Optional capability key
</ins><span class="cx">          * @access protected
</span><span class="cx">          */
</span><del>-        function _init_caps() {
</del><ins>+        function _init_caps( $cap_key = '' ) {
</ins><span class="cx">                 global $wpdb;
</span><del>-                $this->cap_key = $wpdb->prefix . 'capabilities';
</del><ins>+                if ( empty($cap_key) )
+                        $this->cap_key = $wpdb->prefix . 'capabilities';
+                else
+                        $this->cap_key = $cap_key;
</ins><span class="cx">                 $this->caps = &$this->{$this->cap_key};
</span><span class="cx">                 if ( ! is_array( $this->caps ) )
</span><span class="cx">                         $this->caps = array();
</span></span></pre>
</div>
</div>
</body>
</html>