Changeset 38903

Timestamp:

10/25/2016 05:48:22 AM (9 years ago)

Author:

jeremyfelt

Message:

Multisite: Replace get_blog_details() in add_user_to_blog() with get_site().

Adds tests for add_user_to_blog().

Props flixos90.
Fixes #38356.

Location:

trunk

Files:

• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/user/multisite.php (modified) (1 diff)

trunk/src/wp-includes/ms-functions.php

@@ -162 +162 @@
     if ( !get_user_meta($user_id, 'primary_blog', true) ) {
         update_user_meta($user_id, 'primary_blog', $blog_id);
-        $details = get_blog_details($blog_id);
-        update_user_meta($user_id, 'source_domain', $details->domain);
+        $site = get_site( $blog_id );
+        update_user_meta( $user_id, 'source_domain', $site->domain );
     }
 

trunk/tests/phpunit/tests/user/multisite.php

@@ -366 +366 @@
         $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) );
     }
+
+    /**
+     * @ticket 38356
+     */
+    public function test_add_user_to_blog_subscriber() {
+        $site_id = self::factory()->blog->create();
+        $user_id = self::factory()->user->create();
+
+        add_user_to_blog( $site_id, $user_id, 'subscriber' );
+
+        switch_to_blog( $site_id );
+        $user = get_user_by( 'id', $user_id );
+        restore_current_blog();
+
+        wpmu_delete_blog( $site_id );
+        wpmu_delete_user( $user_id );
+
+        $this->assertContains( 'subscriber', $user->roles );
+    }
+
+    /**
+     * @ticket 38356
+     */
+    public function test_add_user_to_blog_invalid_user() {
+        $site_id = self::factory()->blog->create();
+
+        $result = add_user_to_blog( 73622, $site_id, 'subscriber' );
+        wpmu_delete_blog( $site_id );
+
+        $this->assertWPError( $result );
+    }
 }