Changeset 38275 for trunk/src/wp-includes/class-wp-user.php

Timestamp:

08/18/2016 06:20:55 PM (10 years ago)

Author:

wonderboymusic

Message:

Query: add a protected field, $db, (composition, as it were) to WP_*_Query classes to hold the value for the database abstraction, instead of importing the global $wpdb into every method that uses it. Reduces the number of global imports by 32.

See #37699.

File:

• trunk/src/wp-includes/class-wp-user.php (modified) (8 diffs)

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

@@ -103 +103 @@
 
         /**
+         * @since 4.7.0
+         * @access protected
+         * @var wpdb
+         */
+        protected $db;
+
+        /**
          * Constructor.
          *
@@ -109 +116 @@
          * @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.
@@ -117 +122 @@
          */
         public function __construct( $id = 0, $name = '', $blog_id = '' ) {
+                $this->db = $GLOBALS['wpdb'];
+
                 if ( ! isset( self::$back_compat_keys ) ) {
-                        $prefix = $GLOBALS['wpdb']->prefix;
+                        $prefix = $this->db->prefix;
                         self::$back_compat_keys = array(
                                 'user_firstname' => 'first_name',
@@ -233 +240 @@
 
                 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 );
 
@@ -443 +450 @@
          * @since 2.1.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $cap_key Optional capability key
          */
         protected function _init_caps( $cap_key = '' ) {
-                global $wpdb;
-
-                if ( empty($cap_key) )
-                        $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
-                else
+                if ( empty( $cap_key ) ) {
+                        $this->cap_key = $this->db->get_blog_prefix() . 'capabilities';
+                } else {
                         $this->cap_key = $cap_key;
-
+                }
                 $this->caps = get_user_meta( $this->ID, $this->cap_key, true );
 
@@ -632 +635 @@
          * @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, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
+                update_user_meta( $this->ID, $this->db->get_blog_prefix() . 'user_level', $this->user_level );
         }
 
@@ -680 +680 @@
          * @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, $wpdb->get_blog_prefix() . 'user_level' );
+                delete_user_meta( $this->ID, $this->db->get_blog_prefix() . 'user_level' );
                 $this->get_role_caps();
         }
@@ -773 +770 @@
          * @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 = '' ) {
-                global $wpdb;
-                if ( ! empty( $blog_id ) )
-                        $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-                else
+                if ( ! empty( $blog_id ) ) {
+                        $cap_key = $this->db->get_blog_prefix( $blog_id ) . 'capabilities';
+                } else {
                         $cap_key = '';
+                }
                 $this->_init_caps( $cap_key );
         }