Changeset 38768 for trunk/src/wp-includes/class-wp-user.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-user.php (modified) (8 diffs)

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

@@ -105 +105 @@
 
     /**
-     * @since 4.7.0
-     * @access protected
-     * @var wpdb
-     */
-    protected $db;
-
-    /**
      * Constructor.
      *
@@ -118 +111 @@
      * @since 2.0.0
      * @access public
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
      *
      * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
@@ -124 +119 @@
      */
     public function __construct( $id = 0, $name = '', $blog_id = '' ) {
-        $this->db = $GLOBALS['wpdb'];
-
         if ( ! isset( self::$back_compat_keys ) ) {
-            $prefix = $this->db->prefix;
+            $prefix = $GLOBALS['wpdb']->prefix;
             self::$back_compat_keys = array(
                 'user_firstname' => 'first_name',
@@ -242 +235 @@
 
         if ( !$user = $wpdb->get_row( $wpdb->prepare(
-            "SELECT * FROM {$wpdb->users} WHERE $db_field = %s", $value
-        ) ) ) {
+            "SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
+        ) ) )
             return false;
-        }
+
         update_user_caches( $user );
 
@@ -452 +445 @@
      * @since 2.1.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param string $cap_key Optional capability key
      */
     protected function _init_caps( $cap_key = '' ) {
-        if ( empty( $cap_key ) ) {
-            $this->cap_key = $this->db->get_blog_prefix() . 'capabilities';
-        } else {
+        global $wpdb;
+
+        if ( empty($cap_key) )
+            $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+        else
             $this->cap_key = $cap_key;
-        }
+
         $this->caps = get_user_meta( $this->ID, $this->cap_key, true );
 
@@ -637 +634 @@
      * @since 2.0.0
      * @access public
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
      */
     public 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, $this->db->get_blog_prefix() . 'user_level', $this->user_level );
+        update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
     }
 
@@ -682 +682 @@
      * @since 2.1.0
      * @access public
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
      */
     public function remove_all_caps() {
+        global $wpdb;
         $this->caps = array();
         delete_user_meta( $this->ID, $this->cap_key );
-        delete_user_meta( $this->ID, $this->db->get_blog_prefix() . 'user_level' );
+        delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
         $this->get_role_caps();
     }
@@ -772 +775 @@
      * @since 3.0.0
      *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
      * @param int $blog_id Optional. Site ID, defaults to current site.
      */
     public function for_blog( $blog_id = '' ) {
-        if ( ! empty( $blog_id ) ) {
-            $cap_key = $this->db->get_blog_prefix( $blog_id ) . 'capabilities';
-        } else {
+        global $wpdb;
+        if ( ! empty( $blog_id ) )
+            $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+        else
             $cap_key = '';
-        }
         $this->_init_caps( $cap_key );
     }