Ticket #36961: 36961.6.diff

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

@@ -91 +91 @@
         public $filter = null;
 
         /**
+         * The site ID the capabilities of this user are initialized for.
+         *
+         * @since 4.9.0
+         * @var int
+         */
+        private $site_id = 0;
+
+        /**
          * @static
          * @since 3.3.0
          * @var array
@@ -108 +116 @@
          *
          * @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 $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(
@@ -124 +132 @@
                 }
 
                 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;
                 }
 
@@ -143 +151 @@
                 }
 
                 if ( $data ) {
-                        $this->init( $data, $blog_id );
+                        $this->init( $data, $site_id );
                 } else {
                         $this->data = new stdClass;
                 }
@@ -155 +163 @@
          * @since  3.3.0
          *
          * @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 );
         }
 
         /**
@@ -239 +247 @@
         }
 
         /**
-         * Makes private/protected methods readable for backward compatibility.
-         *
-         * @since 4.3.0
-         *
-         * @param callable $name      Method to call.
-         * @param array    $arguments Arguments to pass when calling.
-         * @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 );
-                }
-                return false;
-        }
-
-        /**
          * Magic method for checking the existence of a certain custom field.
          *
          * @since 3.3.0
@@ -431 +423 @@
          * used.
          *
          * @since 2.1.0
+         * @deprecated 4.9.0 Use WP_User::for_site()
          *
          * @global wpdb $wpdb WordPress database abstraction object.
          *
@@ -439 +432 @@
         protected function _init_caps( $cap_key = '' ) {
                 global $wpdb;
 
-                if ( empty($cap_key) )
-                        $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
-                else
-                        $this->cap_key = $cap_key;
+                _deprecated_function( __METHOD__, '4.9.0', 'WP_User::for_site()' );
 
-                $this->caps = get_user_meta( $this->ID, $this->cap_key, true );
+                if ( empty( $cap_key ) ) {
+                        $this->cap_key = $wpdb->get_blog_prefix( $this->site_id ) . 'capabilities';
+                } else {
+                        $this->cap_key = $cap_key;
+                }
 
-                if ( ! is_array( $this->caps ) )
-                        $this->caps = array();
+                $this->caps = $this->get_caps_data();
 
                 $this->get_role_caps();
         }
@@ -465 +458 @@
          * @return array List of all capabilities for the user.
          */
         public function get_role_caps() {
+                $switch_site = false;
+                if ( is_multisite() && $this->site_id != get_current_blog_id() ) {
+                        $switch_site = true;
+
+                        switch_to_blog( $this->site_id );
+                }
+
                 $wp_roles = wp_roles();
 
                 //Filter out caps that are not role names and assign to $this->roles
@@ -479 +479 @@
                 }
                 $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
 
+                if ( $switch_site ) {
+                        restore_current_blog();
+                }
+
                 return $this->allcaps;
         }
 
@@ -753 +757 @@
          * Set the site to operate on. Defaults to the current site.
          *
          * @since 3.0.0
+         * @deprecated 4.9.0 Use WP_User::for_site()
          *
          * @global wpdb $wpdb WordPress database abstraction object.
          *
          * @param int $blog_id Optional. Site ID, defaults to current site.
          */
         public function for_blog( $blog_id = '' ) {
+                _deprecated_function( __METHOD__, '4.9.0', 'WP_User::for_site()' );
+
+                $this->for_site( $blog_id );
+        }
+
+        /**
+         * Sets the site to operate on. Defaults to the current site.
+         *
+         * @since 4.9.0
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+         *
+         * @param int $site_id Site ID to initialize user capabilities for. Default is the current site.
+         */
+        public function for_site( $site_id = '' ) {
                 global $wpdb;
-                if ( ! empty( $blog_id ) )
-                        $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-                else
-                        $cap_key = '';
-                $this->_init_caps( $cap_key );
+
+                if ( ! empty( $site_id ) ) {
+                        $this->site_id = absint( $site_id );
+                } else {
+                        $this->site_id = get_current_blog_id();
+                }
+
+                $this->cap_key = $wpdb->get_blog_prefix( $this->site_id ) . 'capabilities';
+
+                $this->caps = $this->get_caps_data();
+
+                $this->get_role_caps();
+        }
+
+        /**
+         * Gets the available user capabilities data.
+         *
+         * @since 4.9.0
+         *
+         * @return array User capabilities array.
+         */
+        private function get_caps_data() {
+                $caps = get_user_meta( $this->ID, $this->cap_key, true );
+
+                if ( ! is_array( $caps ) ) {
+                        return array();
+                }
+
+                return $caps;
         }
 }

src/wp-includes/ms-blogs.php

@@ -851 +851 @@
         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 */
@@ -925 +925 @@
         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/capabilities.php

@@ -1840 +1840 @@
                 $this->assertFalse( user_can( self::$users['contributor']->ID,   'remove_user', self::$users['contributor']->ID ) );
                 $this->assertFalse( user_can( self::$users['subscriber']->ID,    'remove_user', self::$users['subscriber']->ID ) );
         }
+
+        /**
+         * @ticket 36961
+         * @group ms-required
+         */
+        function test_init_user_caps_for_different_site() {
+                global $wpdb;
+
+                $site_id = self::factory()->blog->create( array( 'user_id' => self::$users['administrator']->ID ) );
+
+                switch_to_blog( $site_id );
+
+                $role_name = 'uploader';
+                add_role( $role_name, 'Uploader', array(
+                        'read'         => true,
+                        'upload_files' => true,
+                ) );
+                add_user_to_blog( $site_id, self::$users['subscriber']->ID, $role_name );
+
+                restore_current_blog();
+
+                $user = new WP_User( self::$users['subscriber']->ID, '', $site_id );
+                $this->assertTrue( $user->has_cap( 'upload_files' ) );
+        }
+
+        /**
+         * @ticket 36961
+         * @group ms-required
+         */
+        function test_init_user_caps_for_different_site_by_user_switch() {
+                global $wpdb;
+
+                $user = new WP_User( self::$users['subscriber']->ID );
+
+                $site_id = self::factory()->blog->create( array( 'user_id' => self::$users['administrator']->ID ) );
+
+                switch_to_blog( $site_id );
+
+                $role_name = 'uploader';
+                add_role( $role_name, 'Uploader', array(
+                        'read'         => true,
+                        'upload_files' => true,
+                ) );
+                add_user_to_blog( $site_id, self::$users['subscriber']->ID, $role_name );
+
+                restore_current_blog();
+
+                $user->for_site( $site_id );
+                $this->assertTrue( $user->has_cap( 'upload_files' ) );
+        }
 }

tests/phpunit/tests/user.php

@@ -180 +180 @@
                 $this->assertEquals( 'foo', $user->$key );
                 $this->assertEquals( 'foo', $user->data->$key );  // This will fail with WP < 3.3
 
-                foreach ( (array) $user as $key => $value ) {
+                foreach ( get_object_vars( $user ) as $key => $value ) {
                         $this->assertEquals( $value, $user->$key );
                 }
         }