<!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>[BuddyPress][8598] trunk/src/bp-blogs/bp-blogs-functions.php: Clean up `bp_blogs_add_user_to_blog()`:</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://buddypress.trac.wordpress.org/changeset/8598">8598</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-11 21:19:06 +0000 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up `bp_blogs_add_user_to_blog()`:
* Compare user roles against `get_editable_roles()` so dynamic roles cannot be accidentally used.
* Use `array_shift()` rather than `array_search()` to speed up comparison.
* Add brackets and inline doc.
See <a href="http://buddypress.trac.wordpress.org/ticket/5749">#5749</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-blogs/bp-blogs-functions.php (8597 => 8598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-functions.php 2014-07-11 20:47:19 UTC (rev 8597)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2014-07-11 21:19:06 UTC (rev 8598)
</span><span class="lines">@@ -780,23 +780,44 @@
</span><span class="cx"> function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ // If no blog ID was passed, use the root blog ID
</ins><span class="cx"> if ( empty( $blog_id ) ) {
</span><span class="cx"> $blog_id = isset( $wpdb->blogid ) ? $wpdb->blogid : bp_get_root_blog_id();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If no role was passed, try to find the blog role
</ins><span class="cx"> if ( empty( $role ) ) {
</span><del>- $key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
</del><span class="cx">
</span><del>- $roles = bp_get_user_meta( $user_id, $key, true );
</del><ins>+ // Get user capabilities
+ $key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
+ $user_roles = bp_get_user_meta( $user_id, $key, true );
</ins><span class="cx">
</span><del>- if ( is_array( $roles ) )
- $role = array_search( 1, $roles );
- else
- return false;
</del><ins>+ // User has roles so lets
+ if ( ! empty( $user_roles ) ) {
+
+ // Look for blog only roles
+ $blog_roles = array_intersect(
+ array_keys( $user_roles ),
+ array_keys( get_editable_roles() )
+ );
+
+ // If there's a role in the array, use the first one. This isn't
+ // very smart, but since roles aren't exactly hierarchical, and
+ // WordPress does not yet have a UI for multiple user roles, it's
+ // fine for now.
+ if ( ! empty( $blog_roles ) ) {
+ $role = array_shift( $blog_roles );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $role != 'subscriber' )
- bp_blogs_record_blog( $blog_id, $user_id, true );
</del><ins>+ // Bail if no role was found or user is a subscriber
+ if ( empty( $role ) || ( $role === 'subscriber' ) ) {
+ return false;
+ }
+
+ // Record the blog activity for this user being added to this blog
+ bp_blogs_record_blog( $blog_id, $user_id, true );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'add_user_to_blog', 'bp_blogs_add_user_to_blog', 10, 3 );
</span><span class="cx"> add_action( 'profile_update', 'bp_blogs_add_user_to_blog' );
</span><span class="lines">@@ -811,8 +832,9 @@
</span><span class="cx"> function bp_blogs_remove_user_from_blog( $user_id, $blog_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( empty( $blog_id ) )
</del><ins>+ if ( empty( $blog_id ) ) {
</ins><span class="cx"> $blog_id = $wpdb->blogid;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bp_blogs_remove_blog_for_user( $user_id, $blog_id );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>