Ticket #38681: 38681.2.diff

src/wp-includes/class-wp-user.php

@@ -113 +113 @@
          *
          * @global wpdb $wpdb WordPress database abstraction object.
          *
-         * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
-         * @param string $name Optional. User's username
-         * @param int $blog_id Optional Site ID, defaults to current site.
+         * @param int|string|stdClass|WP_User $id   User's ID, a WP_User object, or a user object from the DB.
+         * @param string                      $name Optional. User's username
+         * @param int $site_id Optional Site ID, defaults to current site.
          */
-        public function __construct( $id = 0, $name = '', $blog_id = '' ) {
+        public function __construct( $id = 0, $name = '', $site_id = '' ) {
                 if ( ! isset( self::$back_compat_keys ) ) {
                         $prefix = $GLOBALS['wpdb']->prefix;
                         self::$back_compat_keys = array(
@@ -131 +131 @@
                 }
 
                 if ( $id instanceof WP_User ) {
-                        $this->init( $id->data, $blog_id );
+                        $this->init( $id->data, $site_id );
                         return;
                 } elseif ( is_object( $id ) ) {
-                        $this->init( $id, $blog_id );
+                        $this->init( $id, $site_id );
                         return;
                 }
 
@@ -150 +150 @@
                 }
 
                 if ( $data ) {
-                        $this->init( $data, $blog_id );
+                        $this->init( $data, $site_id );
                 } else {
                         $this->data = new stdClass;
                 }
@@ -160 +160 @@
          * Sets up object properties, including capabilities.
          *
          * @param object $data    User DB row object.
-         * @param int    $blog_id Optional. The site ID to initialize for.
+         * @param int    $site_id Optional. The site ID to initialize for.
          */
-        public function init( $data, $blog_id = '' ) {
+        public function init( $data, $site_id = '' ) {
                 $this->data = $data;
                 $this->ID = (int) $data->ID;
 
-                $this->for_blog( $blog_id );
+                $this->for_site( $site_id );
         }
 
         /**
@@ -254 +254 @@
          * @return mixed|false Return value of the callback, false otherwise.
          */
         public function __call( $name, $arguments ) {
-                if ( '_init_caps' === $name ) {
-                        return call_user_func_array( array( $this, $name ), $arguments );
+                switch ( $name ) {
+                        case 'for_blog':
+                                return call_user_func_array( array( $this, 'for_site' ), $arguments );
+                        case '_init_caps':
+                                return call_user_func_array( array( $this, $name ), $arguments );
                 }
+
                 return false;
         }
 
@@ -772 +776 @@
         /**
          * Set the site to operate on. Defaults to the current site.
          *
-         * @since 3.0.0
+         * @since 4.8.0 Replaces for_blog() method.
+         * @access public
          *
          * @global wpdb $wpdb WordPress database abstraction object.
          *
-         * @param int $blog_id Optional. Site ID, defaults to current site.
+         * @param int $site_id Optional. Site ID, defaults to current site.
          */
-        public function for_blog( $blog_id = '' ) {
+        public function for_site( $site_id = '' ) {
                 global $wpdb;
-                if ( ! empty( $blog_id ) )
-                        $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-                else
+
+                if ( ! empty( $site_id ) ) {
+                        $cap_key = $wpdb->get_blog_prefix( $site_id ) . 'capabilities';
+                } else {
                         $cap_key = '';
+                }
+
                 $this->_init_caps( $cap_key );
         }
 }

src/wp-includes/ms-blogs.php

@@ -824 +824 @@
         if ( did_action( 'init' ) ) {
                 $wp_roles = new WP_Roles();
                 $current_user = wp_get_current_user();
-                $current_user->for_blog( $new_blog );
+                $current_user->for_site( $new_blog );
         }
 
         /** This filter is documented in wp-includes/ms-blogs.php */
@@ -898 +898 @@
         if ( did_action( 'init' ) ) {
                 $wp_roles = new WP_Roles();
                 $current_user = wp_get_current_user();
-                $current_user->for_blog( $blog );
+                $current_user->for_site( $blog );
         }
 
         /** This filter is documented in wp-includes/ms-blogs.php */

tests/phpunit/tests/user/multisite.php

@@ -424 +424 @@
 
                 $wp_roles->remove_role( $role );
         }
+
+        public function data_test_switch_site_for_user() {
+                return array(
+                        'for_site' => array( 'for_site' ),
+                        'for_blog' => array( 'for_blog' ),
+                );
+        }
+
+        /**
+         * @ticket 38681
+         * @dataProvider data_test_switch_site_for_user
+         */
+        public function test_switch_site_for_user( $method_name ) {
+                $user = self::factory()->user->create_and_get();
+                $site_id = self::factory()->blog->create();
+
+                call_user_func( array( $user, $method_name ), $site_id );
+
+                wpmu_delete_blog( $site_id );
+                wpmu_delete_user( $user->ID );
+
+                $this->assertFalse( $user->has_cap( 'read' ) );
+        }
 }
 
 endif ;