<!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][8965] trunk: In {{{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/8965">8965</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-08-26 20:53:24 +0000 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In {{{bp_blogs_add_user_to_blog
()}}} function make sure getting user roles returns an array
On multisite configs, when a member registers, he is not assigned to any blog and has no role.
When activating the user from the Manage signups screen, getting his role in {{{bp_blogs_add_user_to_blog()}}} was returning an empty string causing a notice error when trying to get the keys of the "capabilities" usermeta.
To avoid this, we now make sure this usermeta is an array.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5834">#5834</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesmembersclassbpsignupphp">trunk/tests/phpunit/testcases/members/class-bp-signup.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 (8964 => 8965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-functions.php 2014-08-25 23:30:40 UTC (rev 8964)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2014-08-26 20:53:24 UTC (rev 8965)
</span><span class="lines">@@ -859,7 +859,7 @@
</span><span class="cx">
</span><span class="cx"> // Get user capabilities
</span><span class="cx"> $key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
</span><del>- $user_roles = array_keys( bp_get_user_meta( $user_id, $key, true ) );
</del><ins>+ $user_roles = array_keys( (array) bp_get_user_meta( $user_id, $key, true ) );
</ins><span class="cx">
</span><span class="cx"> // User has roles so lets
</span><span class="cx"> if ( ! empty( $user_roles ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmembersclassbpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/testcases/members/class-bp-signup.php (8964 => 8965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/testcases/members/class-bp-signup.php 2014-08-25 23:30:40 UTC (rev 8964)
+++ trunk/tests/phpunit/testcases/members/class-bp-signup.php 2014-08-26 20:53:24 UTC (rev 8965)
</span><span class="lines">@@ -210,4 +210,108 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( array( $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+
+ /**
+ * @group activate
+ */
+ public function test_activate_user_accounts() {
+ $signups = array();
+
+ $signups['accountone'] = $this->factory->signup->create( array(
+ 'user_login' => 'accountone',
+ 'user_email' => 'accountone@example.com',
+ 'activation_key' => 'activationkeyone',
+ ) );
+
+ $signups['accounttwo'] = $this->factory->signup->create( array(
+ 'user_login' => 'accounttwo',
+ 'user_email' => 'accounttwo@example.com',
+ 'activation_key' => 'activationkeytwo',
+ ) );
+
+ $signups['accountthree'] = $this->factory->signup->create( array(
+ 'user_login' => 'accountthree',
+ 'user_email' => 'accountthree@example.com',
+ 'activation_key' => 'activationkeythree',
+ ) );
+
+ $results = BP_Signup::activate( $signups );
+ $this->assertNotEmpty( $results['activated'] );
+
+ $users = array();
+
+ foreach ( $signups as $login => $signup_id ) {
+ $users[ $login ] = get_user_by( 'login', $login );
+ }
+
+ $this->assertEqualSets( $results['activated'], wp_list_pluck( $users, 'ID' ) );
+ }
+
+ /**
+ * @group activate
+ */
+ public function test_activate_user_accounts_with_blogs() {
+ global $wpdb, $current_site;
+
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ $signups = array();
+
+ $signups['blogone'] = $this->factory->signup->create( array(
+ 'user_login' => 'blogone',
+ 'user_email' => 'blogone@example.com',
+ 'domain' => $current_site->domain,
+ 'path' => '/blogone/',
+ 'title' => 'Blog One',
+ 'activation_key' => 'activationkeyblogone',
+ ) );
+
+ $signups['blogtwo'] = $this->factory->signup->create( array(
+ 'user_login' => 'blogtwo',
+ 'user_email' => 'blogtwo@example.com',
+ 'domain' => '',
+ 'path' => '',
+ 'title' => '',
+ 'activation_key' => 'activationkeyblogtwo',
+ ) );
+
+ $signups['blogthree'] = $this->factory->signup->create( array(
+ 'user_login' => 'blogthree',
+ 'user_email' => 'blogthree@example.com',
+ 'domain' => $current_site->domain,
+ 'path' => '/blogthree/',
+ 'title' => 'Blog Three',
+ 'activation_key' => 'activationkeyblogthree',
+ ) );
+
+ // Neutralize db errors
+ $suppress = $wpdb->suppress_errors();
+
+ $results = BP_Signup::activate( $signups );
+
+ $wpdb->suppress_errors( $suppress );
+
+ $this->assertNotEmpty( $results['activated'] );
+
+ $users = array();
+
+ foreach ( $signups as $login => $signup_id ) {
+ $users[ $login ] = get_user_by( 'login', $login );
+ }
+
+ $this->assertEqualSets( $results['activated'], wp_list_pluck( $users, 'ID' ) );
+
+ $blogs = array();
+
+ foreach ( $users as $path => $user ) {
+ $blogs[ $path ] = get_active_blog_for_user( $user->ID );
+ }
+
+ $blogs = array_filter( $blogs );
+ $blogs = array_map( 'basename', wp_list_pluck( $blogs, 'path' ) );
+
+ $this->assertEqualSets( $blogs, array_keys( $blogs ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>