Changeset 38387

Timestamp:

08/26/2016 09:15:22 PM (8 years ago)

Author:

wonderboymusic

Message:

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

See #37699.

File:

• trunk/src/wp-includes/class-wp-roles.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-roles.php

@@ -71 +71 @@
 
     /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
+
+    /**
      * Constructor
      *
@@ -76 +83 @@
      */
     public function __construct() {
+        $this->db = $GLOBALS['wpdb'];
+
         $this->_init();
     }
@@ -106 +115 @@
      * @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;
@@ -138 +146 @@
      * @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 )
-            return;
-
-        global $wpdb;
+        if ( ! $this->use_db ) {
+            return;
+        }
 
         // 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 ) )