Changeset 25615 for trunk/src/wp-includes/capabilities.php

Timestamp:

09/24/2013 11:40:41 PM (11 years ago)

Author:

nacin

Message:

Use the wpdb method instead of $wpdb->prefix.

props hakre.
fixes #16756.

File:

• trunk/src/wp-includes/capabilities.php (modified) (5 diffs)

trunk/src/wp-includes/capabilities.php

@@ -96 +96 @@
     function _init () {
         global $wpdb, $wp_user_roles;
-        $this->role_key = $wpdb->prefix . 'user_roles';
+        $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
         if ( ! empty( $wp_user_roles ) ) {
             $this->roles = $wp_user_roles;
@@ -132 +132 @@
 
         // Duplicated from _init() to avoid an extra function call.
-        $this->role_key = $wpdb->prefix . 'user_roles';
+        $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
         $this->roles = get_option( $this->role_key );
         if ( empty( $this->roles ) )
@@ -710 +710 @@
 
         if ( empty($cap_key) )
-            $this->cap_key = $wpdb->prefix . 'capabilities';
+            $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
         else
             $this->cap_key = $cap_key;
@@ -860 +860 @@
         global $wpdb;
         $this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
-        update_user_meta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
+        update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
     }
 
@@ -902 +902 @@
         $this->caps = array();
         delete_user_meta( $this->ID, $this->cap_key );
-        delete_user_meta( $this->ID, $wpdb->prefix . 'user_level' );
+        delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
         $this->get_role_caps();
     }