Ticket #8663: 8663.diff

wp-includes/user.php

@@ -582 +582 @@
                 }
         }
 
-        $level = $wpdb->prefix . 'user_level';
+        $level = $wpdb->caps_prefix . 'user_level';
         if ( isset( $user->{$level} ) )
                 $user->user_level = $user->{$level};
 

wp-includes/wp-db.php

@@ -386 +386 @@
         /**
          * Sets the table prefix for the WordPress tables.
          *
-         * Also allows for the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE to
-         * override the WordPress users and usersmeta tables that would otherwise be determined by the $prefix.
+         * To share WordPress users and usermeta tables across multiple installs, use
+         * the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE defines.
          *
+         * To share their capabilities as well, use the CUSTOM_CAPS_PREFIX define in
+         * addition to the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE defines.
+         *
          * @since 2.5.0
          *
          * @param string $prefix Alphanumeric name for the new prefix.
@@ -410 +413 @@
 
                 if ( defined('CUSTOM_USER_META_TABLE') )
                         $this->usermeta = CUSTOM_USER_META_TABLE;
+                
+                if ( defined('CUSTOM_CAPS_PREFIX') && defined('CUSTOM_USER_TABLE') && defined('CUSTOM_USER_META_TABLE') )
+                        $this->caps_prefix = CUSTOM_CAPS_PREFIX;
+                else
+                        $this->caps_prefix = $wpdb->prefix;
 
                 return $old_prefix;
         }

wp-includes/capabilities.php

@@ -99 +99 @@
         function _init () {
                 global $wpdb;
                 global $wp_user_roles;
-                $this->role_key = $wpdb->prefix . 'user_roles';
+                $this->role_key = $wpdb->caps_prefix . 'user_roles';
                 if ( ! empty( $wp_user_roles ) ) {
                         $this->roles = $wp_user_roles;
                         $this->use_db = false;
@@ -501 +501 @@
          */
         function _init_caps() {
                 global $wpdb;
-                $this->cap_key = $wpdb->prefix . 'capabilities';
+                $this->cap_key = $wpdb->caps_prefix . 'capabilities';
                 $this->caps = &$this->{$this->cap_key};
                 if ( ! is_array( $this->caps ) )
                         $this->caps = array();

wp-admin/includes/upgrade.php

@@ -581 +581 @@
                 if ( !empty( $user->user_nickname ) )
                         update_usermeta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
                 if ( !empty( $user->user_level ) )
-                        update_usermeta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+                        update_usermeta( $user->ID, $wpdb->caps_prefix . 'user_level', $user->user_level );
                 if ( !empty( $user->user_icq ) )
                         update_usermeta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
                 if ( !empty( $user->user_aim ) )
@@ -606 +606 @@
                 endif;
 
                 // FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-                $caps = get_usermeta( $user->ID, $wpdb->prefix . 'capabilities');
+                $caps = get_usermeta( $user->ID, $wpdb->caps_prefix . 'capabilities');
                 if ( empty($caps) || defined('RESET_CAPS') ) {
-                        $level = get_usermeta($user->ID, $wpdb->prefix . 'user_level');
+                        $level = get_usermeta($user->ID, $wpdb->caps_prefix . 'user_level');
                         $role = translate_level_to_role($level);
-                        update_usermeta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+                        update_usermeta( $user->ID, $wpdb->caps_prefix . 'capabilities', array($role => true) );
                 }
 
         endforeach;

wp-admin/includes/user.php

@@ -204 +204 @@
  */
 function get_author_user_ids() {
         global $wpdb;
-        $level_key = $wpdb->prefix . 'user_level';
+        $level_key = $wpdb->caps_prefix . 'user_level';
         return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
 
@@ -256 +256 @@
                         return false;
         }
 
-        $level_key = $wpdb->prefix . 'user_level';
+        $level_key = $wpdb->caps_prefix . 'user_level';
 
         $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
         if ( $exclude_zeros )
@@ -301 +301 @@
  */
 function get_nonauthor_user_ids() {
         global $wpdb;
-        $level_key = $wpdb->prefix . 'user_level';
+        $level_key = $wpdb->caps_prefix . 'user_level';
 
         return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }