Changeset 12796

Timestamp:

01/22/2010 05:27:28 PM (17 years ago)

Author:

ryan

Message:

Introduce WP_User::for_blog() and current_user_can_for_blog() to avoid calls to WP_User::_init_caps(). fixes #11781

Location:

trunk

Files:

• wp-admin/ms-edit.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (2 diffs)
• wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-admin/ms-edit.php

@@ -223 +223 @@
                 // get blog prefix
                 $blog_prefix = $wpdb->get_blog_prefix( $id );
+
                 // user roles
                 if ( is_array( $_POST[ 'role' ] ) == true ) {
@@ -231 +232 @@
                                 if ( ! $user )
                                         continue;
-                                // Hack. Init user caps for given blog.
-                                $user->_init_caps($blog_prefix . 'capabilities');
+                                $user->for_blog($id);
                                 $user->set_role($role);
                         }

trunk/wp-includes/capabilities.php

@@ -756 +756 @@
         }
 
+        /**
+         * Set the blog to operate on. Defaults to the current blog.
+         *
+         * @since 3.0
+         *
+         * @param int $blog_id Optional Blog ID, defaults to current blog.
+         */
+        function for_blog( $blog_id = '' ) {
+                global $wpdb;
+                if ( !empty($blog_id) ) {
+                        $cap_key = $wpdb->get_blog_prefix( $blog_id );
+                        $cap_key. 'capabilities';
+                } else {
+                        $cap_key = '';
+                }
+                $this->_init_caps($cap_key);
+        }
 }
 
@@ -1019 +1036 @@
 
 /**
+ * Whether current user has a capability or role for a given blog.
+ *
+ * @since 2.0.0
+ *
+ * @param int $blog_id Blog ID
+ * @param string $capability Capability or role name.
+ * @return bool
+ */
+function current_user_can_for_blog( $blog_id, $capability ) {
+        $current_user = wp_get_current_user();
+
+    if ( is_multisite() && is_super_admin() )
+                return true;
+
+        if ( empty( $current_user ) )
+                return false;
+
+        // Create new object to avoid stomping the global current_user.
+        $user = new WP_User( $current_user->id) ;
+
+        // Set the blog id.  @todo add blog id arg to WP_User constructor?
+        $user->for_blog( $blog_id );
+
+        $args = array_slice( func_get_args(), 2 );
+        $args = array_merge( array( $capability ), $args );
+
+        return call_user_func_array( array( &$user, 'has_cap' ), $args );
+}
+
+/**
  * Whether author of supplied post has capability or role.
  *

trunk/wp-includes/ms-functions.php

@@ -307 +307 @@
 
         if ( is_object( $current_user ) )
-                $current_user->_init_caps();
+                $current_user->for_blog( $blog_id );
 
         if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
@@ -360 +360 @@
 
         if ( is_object( $current_user ) )
-                $current_user->_init_caps();
+                $current_user->for_blog( $blog_id );
 
         if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )