Changeset 12770

Timestamp:

01/19/2010 08:12:04 PM (17 years ago)

Author:

ryan

Message:

Use API to set the user's role. see #11781

Location:

trunk

Files:

• wp-admin/ms-edit.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)

trunk/wp-admin/ms-edit.php

@@ -236 +236 @@
                         reset( $newroles );
                         foreach ( (array) $newroles as $userid => $role ) {
-                                $role_len = strlen( $role );
-                                $existing_role = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$userid'  AND meta_key = '" . $blog_prefix. "capabilities'" );
-                                if ( false == $existing_role )
-                                        $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $blog_prefix . "capabilities', 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}')" );
-                                elseif ( $existing_role != "a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}" )
-                                        $wpdb->query( "UPDATE $wpdb->usermeta SET meta_value = 'a:1:{s:" . strlen( $role ) . ":\"" . $role . "\";b:1;}' WHERE user_id = '$userid'  AND meta_key = '" . $blog_prefix . "capabilities'" );
+                                $user = new WP_User($userid);
+                                if ( ! $user )
+                                        continue;
+                                // Hack. Init user caps for given blog.
+                                $user->_init_caps($blog_prefix . 'capabilities');
+                                $user->set_role($role);
                         }
                 }

trunk/wp-includes/capabilities.php

@@ -509 +509 @@
          *
          * @since 2.1.0
+         *
+         * @param string $cap_key Optional capability key
          * @access protected
          */
-        function _init_caps() {
+        function _init_caps( $cap_key = '' ) {
                 global $wpdb;
-                $this->cap_key = $wpdb->prefix . 'capabilities';
+                if ( empty($cap_key) )
+                        $this->cap_key = $wpdb->prefix . 'capabilities';
+                else
+                        $this->cap_key = $cap_key;
                 $this->caps = &$this->{$this->cap_key};
                 if ( ! is_array( $this->caps ) )