Changeset 8965

Timestamp:

08/26/2014 08:53:24 PM (12 years ago)

Author:

imath

Message:

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 #5834

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• tests/phpunit/testcases/members/class-bp-signup.php (modified) (1 diff)

trunk/src/bp-blogs/bp-blogs-functions.php

@@ -860 +860 @@
                 // Get user capabilities
                 $key        = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
-                $user_roles = array_keys( bp_get_user_meta( $user_id, $key, true ) );
+                $user_roles = array_keys( (array) bp_get_user_meta( $user_id, $key, true ) );
 
                 // User has roles so lets

trunk/tests/phpunit/testcases/members/class-bp-signup.php

@@ -211 +211 @@
                 $this->assertEquals( array( $s2 ), wp_list_pluck( $ss['signups'], 'signup_id' ) );
         }
+
+        /**
+         * @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 ) );
+        }
 }