Changeset 38768 for trunk/src/wp-includes/class-wp-roles.php

Timestamp:

10/10/2016 06:37:02 AM (9 years ago)

Author:

pento

Message:

General: Restore usage of $wpdb, instead of $this->db.

Hiding the $wpdb global behind a property decreases the readability of the code, as well as causing irrelevant output when dumping an object.

Reverts [38275], [38278], [38279], [38280], [38387].
See #37699.

File:

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

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

@@ -71 +71 @@
 
     /**
-     * @since 4.7.0
-     * @access protected
-     * @var wpdb
-     */
-    protected $db;
-
-    /**
      * Constructor
      *
@@ -83 +76 @@
      */
     public function __construct() {
-        $this->db = $GLOBALS['wpdb'];
-
         $this->_init();
     }
@@ -118 +109 @@
      */
     protected function _init() {
-        global $wp_user_roles;
-        $this->role_key = $this->db->get_blog_prefix() . 'user_roles';
+        global $wp_user_roles, $wpdb;
+
+        $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
         if ( ! empty( $wp_user_roles ) ) {
             $this->roles = $wp_user_roles;
@@ -148 +140 @@
      */
     public function reinit() {
+        global $wpdb;
+
         // There is no need to reinit if using the wp_user_roles global.
         if ( ! $this->use_db ) {
@@ -154 +148 @@
 
         // Duplicated from _init() to avoid an extra function call.
-        $this->role_key = $this->db->get_blog_prefix() . 'user_roles';
+        $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
         $this->roles = get_option( $this->role_key );
         if ( empty( $this->roles ) )