vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-04 12:44:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
props hakre.
fixes #16756.


git-svn-id: https://develop.svn.wordpress.org/trunk@25615 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2013-09-24 23:40:41 +00:00
parent a580e9f3c3
commit f7050daeba
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/capabilities.php
View File

@@ -95,7 +95,7 @@ class WP_Roles {
*/
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;
$this->use_db = false;
@@ -131,7 +131,7 @@ class WP_Roles {
global $wpdb, $wp_user_roles;
// 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 ) )
return;
@@ -709,7 +709,7 @@ class WP_User {
global $wpdb;
if ( empty($cap_key) )
$this->cap_key = $wpdb->prefix . 'capabilities';
$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
else
$this->cap_key = $cap_key;
@@ -859,7 +859,7 @@ class WP_User {
function update_user_level_from_caps() {
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 );
}
/**
@@ -901,7 +901,7 @@ class WP_User {
global $wpdb;
$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();
}