sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roles: set a property, $db, on WP_Roles to reduce global imports.

Browse Source 
See #37699.


git-svn-id: https://develop.svn.wordpress.org/trunk@38387 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2016-08-26 21:15:22 +00:00
parent 3586ac294f
commit aa2fcba472
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wp-includes/class-wp-roles.php
View File

@ -69,12 +69,21 @@ class WP_Roles {
*/
public $use_db = true;
/**
* @since 4.7.0
* @access protected
* @var wpdb
*/
protected $db;
/**
* Constructor
*
* @since 2.0.0
*/
public function __construct() {
$this->db = $GLOBALS['wpdb'];
$this->_init();
}
@ -105,12 +114,11 @@ class WP_Roles {
* @since 2.1.0
* @access protected
*
* @global wpdb $wpdb WordPress database abstraction object.
* @global array $wp_user_roles Used to set the 'roles' property value.
*/
protected function _init() {
global $wpdb, $wp_user_roles;
$this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
global $wp_user_roles;
$this->role_key = $this->db->get_blog_prefix() . 'user_roles';
if ( ! empty( $wp_user_roles ) ) {
$this->roles = $wp_user_roles;
$this->use_db = false;
@ -137,18 +145,15 @@ class WP_Roles {
*
* @since 3.5.0
* @access public
*
* @global wpdb $wpdb WordPress database abstraction object.
*/
public function reinit() {
// There is no need to reinit if using the wp_user_roles global.
if ( ! $this->use_db )
if ( ! $this->use_db ) {
return;
global $wpdb;
}
// Duplicated from _init() to avoid an extra function call.
$this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
$this->role_key = $this->db->get_blog_prefix() . 'user_roles';
$this->roles = get_option( $this->role_key );
if ( empty( $this->roles ) )
return;