Changeset 25615

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.

Location:

trunk/src/wp-includes

Files:

• capabilities.php (modified) (5 diffs)
• ms-blogs.php (modified) (2 diffs)
• user.php (modified) (3 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();
     }

trunk/src/wp-includes/ms-blogs.php

@@ -499 +499 @@
 
     $wpdb->set_blog_id( $new_blog );
-    $GLOBALS['table_prefix'] = $wpdb->prefix;
+    $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
     $prev_blog_id = $GLOBALS['blog_id'];
     $GLOBALS['blog_id'] = $new_blog;
@@ -562 +562 @@
     $prev_blog_id = $GLOBALS['blog_id'];
     $GLOBALS['blog_id'] = $blog;
-    $GLOBALS['table_prefix'] = $wpdb->prefix;
+    $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
     if ( function_exists( 'wp_cache_switch_to_blog' ) ) {

trunk/src/wp-includes/user.php

@@ -249 +249 @@
         return false;
 
-    if ( $user->has_prop( $wpdb->prefix . $option ) ) // Blog specific
-        $result = $user->get( $wpdb->prefix . $option );
+    $prefix = $wpdb->get_blog_prefix();
+    if ( $user->has_prop( $prefix . $option ) ) // Blog specific
+        $result = $user->get( $prefix . $option );
     elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
         $result = $user->get( $option );
@@ -281 +282 @@
 
     if ( !$global )
-        $option_name = $wpdb->prefix . $option_name;
+        $option_name = $wpdb->get_blog_prefix() . $option_name;
 
     return update_user_meta( $user_id, $option_name, $newvalue );
@@ -305 +306 @@
 
     if ( !$global )
-        $option_name = $wpdb->prefix . $option_name;
+        $option_name = $wpdb->get_blog_prefix() . $option_name;
     return delete_user_meta( $user_id, $option_name );
 }