Changeset 38275

Timestamp:

08/18/2016 06:20:55 PM (8 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.

Location:

trunk/src/wp-includes

Files:

• class-wp-comment-query.php (modified) (29 diffs)
• class-wp-meta-query.php (modified) (10 diffs)
• class-wp-network-query.php (modified) (15 diffs)
• class-wp-site-query.php (modified) (15 diffs)
• class-wp-tax-query.php (modified) (13 diffs)
• class-wp-term-query.php (modified) (9 diffs)
• class-wp-user-query.php (modified) (23 diffs)
• class-wp-user.php (modified) (8 diffs)
• class-wp-xmlrpc-server.php (modified) (17 diffs)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -141 +141 @@
         return false;
     }
+
+    /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
 
     /**
@@ -261 +268 @@
      */
     public function __construct( $query = '' ) {
+        $this->db = $GLOBALS['wpdb'];
+
         $this->query_var_defaults = array(
             'author_email' => '',
@@ -364 +373 @@
      * @access public
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @return int|array List of comments or number of found comments if `$count` argument is true.
      */
     public function get_comments() {
-        global $wpdb;
-
         $this->parse_query();
 
@@ -389 +394 @@
         $this->meta_query->parse_query_vars( $this->query_vars );
         if ( ! empty( $this->meta_query->queries ) ) {
-            $this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+            $this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $this->db->comments, 'comment_ID', $this );
         }
 
@@ -481 +486 @@
      * @since 4.4.0
      * @access protected
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      */
     protected function get_comment_ids() {
-        global $wpdb;
-
         // Assemble clauses related to 'comment_approved'.
         $approved_clauses = array();
@@ -515 +516 @@
 
                     default :
-                        $status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+                        $status_clauses[] = $this->db->prepare( "comment_approved = %s", $status );
                         break;
                 }
@@ -538 +539 @@
                 // Numeric values are assumed to be user ids.
                 if ( is_numeric( $unapproved_identifier ) ) {
-                    $approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
+                    $approved_clauses[] = $this->db->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
 
                 // Otherwise we match against email addresses.
                 } else {
-                    $approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+                    $approved_clauses[] = $this->db->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
                 }
             }
@@ -601 +602 @@
             // If no valid clauses were found, order by comment_date_gmt.
             if ( empty( $orderby_array ) ) {
-                $orderby_array[] = "$wpdb->comments.comment_date_gmt $order";
+                $orderby_array[] = "{$this->db->comments}.comment_date_gmt $order";
             }
 
@@ -634 +635 @@
                 }
 
-                $orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
+                $orderby_array[] = "{$this->db->comments}.comment_ID $comment_ID_order";
             }
 
             $orderby = implode( ', ', $orderby_array );
         } else {
-            $orderby = "$wpdb->comments.comment_date_gmt $order";
+            $orderby = "{$this->db->comments}.comment_date_gmt $order";
         }
 
@@ -656 +657 @@
             $fields = 'COUNT(*)';
         } else {
-            $fields = "$wpdb->comments.comment_ID";
+            $fields = "{$this->db->comments}.comment_ID";
         }
 
         $post_id = absint( $this->query_vars['post_id'] );
         if ( ! empty( $post_id ) ) {
-            $this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
+            $this->sql_clauses['where']['post_id'] = $this->db->prepare( 'comment_post_ID = %d', $post_id );
         }
 
         // Parse comment IDs for an IN clause.
         if ( ! empty( $this->query_vars['comment__in'] ) ) {
-            $this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+            $this->sql_clauses['where']['comment__in'] = "{$this->db->comments}.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
         }
 
         // Parse comment IDs for a NOT IN clause.
         if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-            $this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+            $this->sql_clauses['where']['comment__not_in'] = "{$this->db->comments}.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
         }
 
@@ -695 +696 @@
 
         if ( '' !== $this->query_vars['author_email'] ) {
-            $this->sql_clauses['where']['author_email'] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
+            $this->sql_clauses['where']['author_email'] = $this->db->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
         }
 
         if ( '' !== $this->query_vars['author_url'] ) {
-            $this->sql_clauses['where']['author_url'] = $wpdb->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
+            $this->sql_clauses['where']['author_url'] = $this->db->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
         }
 
         if ( '' !== $this->query_vars['karma'] ) {
-            $this->sql_clauses['where']['karma'] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
+            $this->sql_clauses['where']['karma'] = $this->db->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
         }
 
@@ -734 +735 @@
 
                     default:
-                        $comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
+                        $comment_types[ $operator ][] = $this->db->prepare( '%s', $type );
                         break;
                 }
@@ -751 +752 @@
 
         if ( '' !== $parent ) {
-            $this->sql_clauses['where']['parent'] = $wpdb->prepare( 'comment_parent = %d', $parent );
+            $this->sql_clauses['where']['parent'] = $this->db->prepare( 'comment_parent = %d', $parent );
         }
 
@@ -757 +758 @@
             $this->sql_clauses['where']['user_id'] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
         } elseif ( '' !== $this->query_vars['user_id'] ) {
-            $this->sql_clauses['where']['user_id'] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
+            $this->sql_clauses['where']['user_id'] = $this->db->prepare( 'user_id = %d', $this->query_vars['user_id'] );
         }
 
@@ -781 +782 @@
                 // $field_value may be an array.
                 $esses = array_fill( 0, count( (array) $field_value ), '%s' );
-                $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+                $this->sql_clauses['where'][ $field_name ] = $this->db->prepare( " {$this->db->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
             }
         }
@@ -802 +803 @@
 
                 $esses = array_fill( 0, count( $q_values ), '%s' );
-                $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
+                $this->sql_clauses['where'][ $field_name ] = $this->db->prepare( " {$this->db->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
             }
         }
@@ -831 +832 @@
 
         if ( $join_posts_table ) {
-            $join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
+            $join .= "JOIN {$this->db->posts} ON {$this->db->posts}.ID = {$this->db->comments}.comment_post_ID";
         }
 
@@ -841 +842 @@
 
             if ( ! $this->query_vars['count'] ) {
-                $groupby = "{$wpdb->comments}.comment_ID";
+                $groupby = "{$this->db->comments}.comment_ID";
             }
         }
@@ -890 +891 @@
 
         $this->sql_clauses['select']  = "SELECT $found_rows $fields";
-        $this->sql_clauses['from']    = "FROM $wpdb->comments $join";
+        $this->sql_clauses['from']    = "FROM {$this->db->comments} $join";
         $this->sql_clauses['groupby'] = $groupby;
         $this->sql_clauses['orderby'] = $orderby;
@@ -898 +899 @@
 
         if ( $this->query_vars['count'] ) {
-            return intval( $wpdb->get_var( $this->request ) );
+            return intval( $this->db->get_var( $this->request ) );
         } else {
-            $comment_ids = $wpdb->get_col( $this->request );
+            $comment_ids = $this->db->get_col( $this->request );
             return array_map( 'intval', $comment_ids );
         }
@@ -911 +912 @@
      * @since 4.6.0
      * @access private
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      */
     private function set_found_comments() {
-        global $wpdb;
-
         if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
             /**
@@ -928 +925 @@
             $found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
 
-            $this->found_comments = (int) $wpdb->get_var( $found_comments_query );
+            $this->found_comments = (int) $this->db->get_var( $found_comments_query );
         }
     }
@@ -944 +941 @@
      */
     protected function fill_descendants( $comments ) {
-        global $wpdb;
-
         $levels = array(
             0 => wp_list_pluck( $comments, 'comment_ID' ),
@@ -997 +992 @@
             if ( $uncached_parent_ids ) {
                 $where = 'WHERE ' . $_where . ' AND comment_parent IN (' . implode( ',', array_map( 'intval', $uncached_parent_ids ) ) . ')';
-                $level_comments = $wpdb->get_results( "SELECT $wpdb->comments.comment_ID, $wpdb->comments.comment_parent {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC" );
+                $level_comments = $this->db->get_results( "SELECT {$this->db->comments}.comment_ID, {$this->db->comments}.comment_parent {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} ORDER BY comment_date_gmt ASC, comment_ID ASC" );
 
                 // Cache parent-child relationships.
@@ -1068 +1063 @@
      * @access protected
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param string $string
      * @param array $cols
@@ -1075 +1068 @@
      */
     protected function get_search_sql( $string, $cols ) {
-        global $wpdb;
-
-        $like = '%' . $wpdb->esc_like( $string ) . '%';
+        $like = '%' . $this->db->esc_like( $string ) . '%';
 
         $searches = array();
         foreach ( $cols as $col ) {
-            $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+            $searches[] = $this->db->prepare( "$col LIKE %s", $like );
         }
 
@@ -1093 +1084 @@
      * @access protected
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param string $orderby Alias for the field to order by.
      * @return string|false Value to used in the ORDER clause. False otherwise.
      */
     protected function parse_orderby( $orderby ) {
-        global $wpdb;
-
         $allowed_keys = array(
             'comment_agent',
@@ -1132 +1119 @@
         $parsed = false;
         if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
-            $parsed = "$wpdb->commentmeta.meta_value";
+            $parsed = "{$this->db->commentmeta}.meta_value";
         } elseif ( $orderby == 'meta_value_num' ) {
-            $parsed = "$wpdb->commentmeta.meta_value+0";
+            $parsed = "{$this->db->commentmeta}.meta_value+0";
         } elseif ( $orderby == 'comment__in' ) {
             $comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
-            $parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
+            $parsed = "FIELD( {$this->db->comments}.comment_ID, $comment__in )";
         } elseif ( in_array( $orderby, $allowed_keys ) ) {
 
@@ -1144 +1131 @@
                 $parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
             } else {
-                $parsed = "$wpdb->comments.$orderby";
+                $parsed = "{$this->db->comments}.$orderby";
             }
         }

trunk/src/wp-includes/class-wp-meta-query.php

@@ -107 +107 @@
 
     /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
+
+    /**
      * Constructor.
      *
@@ -138 +145 @@
      */
     public function __construct( $meta_query = false ) {
-        if ( !$meta_query )
+        $this->db = $GLOBALS['wpdb'];
+
+        if ( ! $meta_query ) {
             return;
+        }
 
         if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
@@ -485 +495 @@
      * @access public
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param array  $clause       Query clause, passed by reference.
      * @param array  $parent_query Parent query array.
@@ -499 +507 @@
      */
     public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
-        global $wpdb;
-
         $sql_chunks = array(
             'where' => array(),
@@ -538 +544 @@
                 $join .= " LEFT JOIN $this->meta_table";
                 $join .= $i ? " AS $alias" : '';
-                $join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
+                $join .= $this->db->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
 
             // All other JOIN clauses.
@@ -582 +588 @@
                 $sql_chunks['where'][] = $alias . '.' . $this->meta_id_column . ' IS NULL';
             } else {
-                $sql_chunks['where'][] = $wpdb->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
+                $sql_chunks['where'][] = $this->db->prepare( "$alias.meta_key = %s", trim( $clause['key'] ) );
             }
         }
@@ -602 +608 @@
                 case 'NOT IN' :
                     $meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
-                    $where = $wpdb->prepare( $meta_compare_string, $meta_value );
+                    $where = $this->db->prepare( $meta_compare_string, $meta_value );
                     break;
 
@@ -608 +614 @@
                 case 'NOT BETWEEN' :
                     $meta_value = array_slice( $meta_value, 0, 2 );
-                    $where = $wpdb->prepare( '%s AND %s', $meta_value );
+                    $where = $this->db->prepare( '%s AND %s', $meta_value );
                     break;
 
                 case 'LIKE' :
                 case 'NOT LIKE' :
-                    $meta_value = '%' . $wpdb->esc_like( $meta_value ) . '%';
-                    $where = $wpdb->prepare( '%s', $meta_value );
+                    $meta_value = '%' . $this->db->esc_like( $meta_value ) . '%';
+                    $where = $this->db->prepare( '%s', $meta_value );
                     break;
 
@@ -620 +626 @@
                 case 'EXISTS' :
                     $meta_compare = '=';
-                    $where = $wpdb->prepare( '%s', $meta_value );
+                    $where = $this->db->prepare( '%s', $meta_value );
                     break;
 
@@ -629 +635 @@
 
                 default :
-                    $where = $wpdb->prepare( '%s', $meta_value );
+                    $where = $this->db->prepare( '%s', $meta_value );
                     break;
 

trunk/src/wp-includes/class-wp-network-query.php

@@ -86 +86 @@
      */
     public $max_num_pages = 0;
+
+    /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
 
     /**
@@ -125 +132 @@
      */
     public function __construct( $query = '' ) {
+        $this->db = $GLOBALS['wpdb'];
+
         $this->query_var_defaults = array(
             'network__in'          => '',
@@ -291 +300 @@
      */
     protected function get_network_ids() {
-        global $wpdb;
-
         $order = $this->parse_order( $this->query_vars['order'] );
 
@@ -333 +340 @@
             $orderby = implode( ', ', $orderby_array );
         } else {
-            $orderby = "$wpdb->site.id $order";
+            $orderby = "{$this->db->site}.id $order";
         }
 
@@ -350 +357 @@
             $fields = 'COUNT(*)';
         } else {
-            $fields = "$wpdb->site.id";
+            $fields = "{$this->db->site}.id";
         }
 
         // Parse network IDs for an IN clause.
         if ( ! empty( $this->query_vars['network__in'] ) ) {
-            $this->sql_clauses['where']['network__in'] = "$wpdb->site.id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__in'] ) ) . ' )';
+            $this->sql_clauses['where']['network__in'] = "{$this->db->site}.id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__in'] ) ) . ' )';
         }
 
         // Parse network IDs for a NOT IN clause.
         if ( ! empty( $this->query_vars['network__not_in'] ) ) {
-            $this->sql_clauses['where']['network__not_in'] = "$wpdb->site.id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__not_in'] ) ) . ' )';
+            $this->sql_clauses['where']['network__not_in'] = "{$this->db->site}.id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['network__not_in'] ) ) . ' )';
         }
 
         if ( ! empty( $this->query_vars['domain'] ) ) {
-            $this->sql_clauses['where']['domain'] = $wpdb->prepare( "$wpdb->site.domain = %s", $this->query_vars['domain'] );
+            $this->sql_clauses['where']['domain'] = $this->db->prepare( "{$this->db->site}.domain = %s", $this->query_vars['domain'] );
         }
 
         // Parse network domain for an IN clause.
         if ( is_array( $this->query_vars['domain__in'] ) ) {
-            $this->sql_clauses['where']['domain__in'] = "$wpdb->site.domain IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__in'] ) ) . "' )";
+            $this->sql_clauses['where']['domain__in'] = "{$this->db->site}.domain IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__in'] ) ) . "' )";
         }
 
         // Parse network domain for a NOT IN clause.
         if ( is_array( $this->query_vars['domain__not_in'] ) ) {
-            $this->sql_clauses['where']['domain__not_in'] = "$wpdb->site.domain NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
+            $this->sql_clauses['where']['domain__not_in'] = "{$this->db->site}.domain NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
         }
 
         if ( ! empty( $this->query_vars['path'] ) ) {
-            $this->sql_clauses['where']['path'] = $wpdb->prepare( "$wpdb->site.path = %s", $this->query_vars['path'] );
+            $this->sql_clauses['where']['path'] = $this->db->prepare( "{$this->db->site}.path = %s", $this->query_vars['path'] );
         }
 
         // Parse network path for an IN clause.
         if ( is_array( $this->query_vars['path__in'] ) ) {
-            $this->sql_clauses['where']['path__in'] = "$wpdb->site.path IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__in'] ) ) . "' )";
+            $this->sql_clauses['where']['path__in'] = "{$this->db->site}.path IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__in'] ) ) . "' )";
         }
 
         // Parse network path for a NOT IN clause.
         if ( is_array( $this->query_vars['path__not_in'] ) ) {
-            $this->sql_clauses['where']['path__not_in'] = "$wpdb->site.path NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
+            $this->sql_clauses['where']['path__not_in'] = "{$this->db->site}.path NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
         }
 
@@ -395 +402 @@
             $this->sql_clauses['where']['search'] = $this->get_search_sql(
                 $this->query_vars['search'],
-                array( "$wpdb->site.domain", "$wpdb->site.path" )
+                array( "{$this->db->site}.domain", "{$this->db->site}.path" )
             );
         }
@@ -440 +447 @@
 
         $this->sql_clauses['select']  = "SELECT $found_rows $fields";
-        $this->sql_clauses['from']    = "FROM $wpdb->site $join";
+        $this->sql_clauses['from']    = "FROM {$this->db->site} $join";
         $this->sql_clauses['groupby'] = $groupby;
         $this->sql_clauses['orderby'] = $orderby;
@@ -448 +455 @@
 
         if ( $this->query_vars['count'] ) {
-            return intval( $wpdb->get_var( $this->request ) );
-        }
-
-        $network_ids = $wpdb->get_col( $this->request );
+            return intval( $this->db->get_var( $this->request ) );
+        }
+
+        $network_ids = $this->db->get_col( $this->request );
 
         return array_map( 'intval', $network_ids );
@@ -462 +469 @@
      * @since 4.6.0
      * @access private
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      */
     private function set_found_networks() {
-        global $wpdb;
-
         if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
             /**
@@ -479 +482 @@
             $found_networks_query = apply_filters( 'found_networks_query', 'SELECT FOUND_ROWS()', $this );
 
-            $this->found_networks = (int) $wpdb->get_var( $found_networks_query );
+            $this->found_networks = (int) $this->db->get_var( $found_networks_query );
         }
     }
@@ -488 +491 @@
      * @since 4.6.0
      * @access protected
-     *
-     * @global wpdb  $wpdb WordPress database abstraction object.
      *
      * @param string $string  Search string.
@@ -497 +498 @@
      */
     protected function get_search_sql( $string, $columns ) {
-        global $wpdb;
-
-        $like = '%' . $wpdb->esc_like( $string ) . '%';
+        $like = '%' . $this->db->esc_like( $string ) . '%';
 
         $searches = array();
         foreach ( $columns as $column ) {
-            $searches[] = $wpdb->prepare( "$column LIKE %s", $like );
+            $searches[] = $this->db->prepare( "$column LIKE %s", $like );
         }
 
@@ -514 +513 @@
      * @since 4.6.0
      * @access protected
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      *
      * @param string $orderby Alias for the field to order by.
@@ -521 +518 @@
      */
     protected function parse_orderby( $orderby ) {
-        global $wpdb;
-
         $allowed_keys = array(
             'id',
@@ -532 +527 @@
         if ( $orderby == 'network__in' ) {
             $network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
-            $parsed = "FIELD( {$wpdb->site}.id, $network__in )";
+            $parsed = "FIELD( {$this->db->site}.id, $network__in )";
         } elseif ( $orderby == 'domain_length' || $orderby == 'path_length' ) {
             $field = substr( $orderby, 0, -7 );
-            $parsed = "CHAR_LENGTH($wpdb->site.$field)";
+            $parsed = "CHAR_LENGTH({$this->db->site}.$field)";
         } elseif ( in_array( $orderby, $allowed_keys ) ) {
-            $parsed = "$wpdb->site.$orderby";
+            $parsed = "{$this->db->site}.$orderby";
         }
 

trunk/src/wp-includes/class-wp-site-query.php

@@ -95 +95 @@
      */
     public $max_num_pages = 0;
+
+    /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
 
     /**
@@ -148 +155 @@
      */
     public function __construct( $query = '' ) {
+        $this->db = $GLOBALS['wpdb'];
+
         $this->query_var_defaults = array(
             'fields'            => '',
@@ -326 +335 @@
      * @access protected
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @return int|array A single count of site IDs if a count query. An array of site IDs if a full query.
      */
     protected function get_site_ids() {
-        global $wpdb;
-
         $order = $this->parse_order( $this->query_vars['order'] );
 
@@ -396 +401 @@
         $site_id = absint( $this->query_vars['ID'] );
         if ( ! empty( $site_id ) ) {
-            $this->sql_clauses['where']['ID'] = $wpdb->prepare( 'blog_id = %d', $site_id );
+            $this->sql_clauses['where']['ID'] = $this->db->prepare( 'blog_id = %d', $site_id );
         }
 
@@ -412 +417 @@
 
         if ( ! empty( $network_id ) ) {
-            $this->sql_clauses['where']['network_id'] = $wpdb->prepare( 'site_id = %d', $network_id );
+            $this->sql_clauses['where']['network_id'] = $this->db->prepare( 'site_id = %d', $network_id );
         }
 
@@ -426 +431 @@
 
         if ( ! empty( $this->query_vars['domain'] ) ) {
-            $this->sql_clauses['where']['domain'] = $wpdb->prepare( 'domain = %s', $this->query_vars['domain'] );
+            $this->sql_clauses['where']['domain'] = $this->db->prepare( 'domain = %s', $this->query_vars['domain'] );
         }
 
         // Parse site domain for an IN clause.
         if ( is_array( $this->query_vars['domain__in'] ) ) {
-            $this->sql_clauses['where']['domain__in'] = "domain IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__in'] ) ) . "' )";
+            $this->sql_clauses['where']['domain__in'] = "domain IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__in'] ) ) . "' )";
         }
 
         // Parse site domain for a NOT IN clause.
         if ( is_array( $this->query_vars['domain__not_in'] ) ) {
-            $this->sql_clauses['where']['domain__not_in'] = "domain NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
+            $this->sql_clauses['where']['domain__not_in'] = "domain NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['domain__not_in'] ) ) . "' )";
         }
 
         if ( ! empty( $this->query_vars['path'] ) ) {
-            $this->sql_clauses['where']['path'] = $wpdb->prepare( 'path = %s', $this->query_vars['path'] );
+            $this->sql_clauses['where']['path'] = $this->db->prepare( 'path = %s', $this->query_vars['path'] );
         }
 
         // Parse site path for an IN clause.
         if ( is_array( $this->query_vars['path__in'] ) ) {
-            $this->sql_clauses['where']['path__in'] = "path IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__in'] ) ) . "' )";
+            $this->sql_clauses['where']['path__in'] = "path IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__in'] ) ) . "' )";
         }
 
         // Parse site path for a NOT IN clause.
         if ( is_array( $this->query_vars['path__not_in'] ) ) {
-            $this->sql_clauses['where']['path__not_in'] = "path NOT IN ( '" . implode( "', '", $wpdb->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
+            $this->sql_clauses['where']['path__not_in'] = "path NOT IN ( '" . implode( "', '", $this->db->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
         }
 
         if ( is_numeric( $this->query_vars['archived'] ) ) {
             $archived = absint( $this->query_vars['archived'] );
-            $this->sql_clauses['where']['archived'] = $wpdb->prepare( "archived = %d ", $archived );
+            $this->sql_clauses['where']['archived'] = $this->db->prepare( "archived = %d ", $archived );
         }
 
         if ( is_numeric( $this->query_vars['mature'] ) ) {
             $mature = absint( $this->query_vars['mature'] );
-            $this->sql_clauses['where']['mature'] = $wpdb->prepare( "mature = %d ", $mature );
+            $this->sql_clauses['where']['mature'] = $this->db->prepare( "mature = %d ", $mature );
         }
 
         if ( is_numeric( $this->query_vars['spam'] ) ) {
             $spam = absint( $this->query_vars['spam'] );
-            $this->sql_clauses['where']['spam'] = $wpdb->prepare( "spam = %d ", $spam );
+            $this->sql_clauses['where']['spam'] = $this->db->prepare( "spam = %d ", $spam );
         }
 
         if ( is_numeric( $this->query_vars['deleted'] ) ) {
             $deleted = absint( $this->query_vars['deleted'] );
-            $this->sql_clauses['where']['deleted'] = $wpdb->prepare( "deleted = %d ", $deleted );
+            $this->sql_clauses['where']['deleted'] = $this->db->prepare( "deleted = %d ", $deleted );
         }
 
         if ( is_numeric( $this->query_vars['public'] ) ) {
             $public = absint( $this->query_vars['public'] );
-            $this->sql_clauses['where']['public'] = $wpdb->prepare( "public = %d ", $public );
+            $this->sql_clauses['where']['public'] = $this->db->prepare( "public = %d ", $public );
         }
 
@@ -551 +556 @@
 
         $this->sql_clauses['select']  = "SELECT $found_rows $fields";
-        $this->sql_clauses['from']    = "FROM $wpdb->blogs $join";
+        $this->sql_clauses['from']    = "FROM {$this->db->blogs} $join";
         $this->sql_clauses['groupby'] = $groupby;
         $this->sql_clauses['orderby'] = $orderby;
@@ -559 +564 @@
 
         if ( $this->query_vars['count'] ) {
-            return intval( $wpdb->get_var( $this->request ) );
-        }
-
-        $site_ids = $wpdb->get_col( $this->request );
+            return intval( $this->db->get_var( $this->request ) );
+        }
+
+        $site_ids = $this->db->get_col( $this->request );
 
         return array_map( 'intval', $site_ids );
@@ -573 +578 @@
      * @since 4.6.0
      * @access private
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      */
     private function set_found_sites() {
-        global $wpdb;
-
         if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
             /**
@@ -590 +591 @@
             $found_sites_query = apply_filters( 'found_sites_query', 'SELECT FOUND_ROWS()', $this );
 
-            $this->found_sites = (int) $wpdb->get_var( $found_sites_query );
+            $this->found_sites = (int) $this->db->get_var( $found_sites_query );
         }
     }
@@ -599 +600 @@
      * @since 4.6.0
      * @access protected
-     *
-     * @global wpdb  $wpdb WordPress database abstraction object.
      *
      * @param string $string  Search string.
@@ -607 +606 @@
      */
     protected function get_search_sql( $string, $columns ) {
-        global $wpdb;
-
         if ( false !== strpos( $string, '*' ) ) {
-            $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $string ) ) ) . '%';
+            $like = '%' . implode( '%', array_map( array( $this->db, 'esc_like' ), explode( '*', $string ) ) ) . '%';
         } else {
-            $like = '%' . $wpdb->esc_like( $string ) . '%';
+            $like = '%' . $this->db->esc_like( $string ) . '%';
         }
 
         $searches = array();
         foreach ( $columns as $column ) {
-            $searches[] = $wpdb->prepare( "$column LIKE %s", $like );
+            $searches[] = $this->db->prepare( "$column LIKE %s", $like );
         }
 
@@ -628 +625 @@
      * @since 4.6.0
      * @access protected
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      *
      * @param string $orderby Alias for the field to order by.
@@ -635 +630 @@
      */
     protected function parse_orderby( $orderby ) {
-        global $wpdb;
-
         $parsed = false;
 
@@ -642 +635 @@
             case 'site__in':
                 $site__in = implode( ',', array_map( 'absint', $this->query_vars['site__in'] ) );
-                $parsed = "FIELD( {$wpdb->blogs}.blog_id, $site__in )";
+                $parsed = "FIELD( {$this->db->blogs}.blog_id, $site__in )";
                 break;
             case 'network__in':
                 $network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
-                $parsed = "FIELD( {$wpdb->blogs}.site_id, $network__in )";
+                $parsed = "FIELD( {$this->db->blogs}.site_id, $network__in )";
                 break;
             case 'domain':

trunk/src/wp-includes/class-wp-tax-query.php

@@ -93 +93 @@
 
     /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
+
+    /**
      * Constructor.
      *
@@ -120 +127 @@
      */
     public function __construct( $tax_query ) {
+        $this->db = $GLOBALS['wpdb'];
+
         if ( isset( $tax_query['relation'] ) ) {
             $this->relation = $this->sanitize_relation( $tax_query['relation'] );
@@ -388 +397 @@
      * @access public
      *
-     * @global wpdb $wpdb The WordPress database abstraction object.
-     *
      * @param array $clause       Query clause, passed by reference.
      * @param array $parent_query Parent query array.
@@ -400 +407 @@
      */
     public function get_sql_for_clause( &$clause, $parent_query ) {
-        global $wpdb;
-
         $sql = array(
             'where' => array(),
@@ -433 +438 @@
             if ( false === $alias ) {
                 $i = count( $this->table_aliases );
-                $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+                $alias = $i ? 'tt' . $i : $this->db->term_relationships;
 
                 // Store the alias as part of a flat array to build future iterators.
@@ -441 +446 @@
                 $clause['alias'] = $alias;
 
-                $join .= " LEFT JOIN $wpdb->term_relationships";
+                $join .= " LEFT JOIN {$this->db->term_relationships}";
                 $join .= $i ? " AS $alias" : '';
                 $join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";
@@ -459 +464 @@
             $where = "$this->primary_table.$this->primary_id_column NOT IN (
                 SELECT object_id
-                FROM $wpdb->term_relationships
+                FROM {$this->db->term_relationships}
                 WHERE term_taxonomy_id IN ($terms)
             )";
@@ -475 +480 @@
             $where = "(
                 SELECT COUNT(1)
-                FROM $wpdb->term_relationships
+                FROM {$this->db->term_relationships}
                 WHERE term_taxonomy_id IN ($terms)
                 AND object_id = $this->primary_table.$this->primary_id_column
@@ -482 +487 @@
         } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
 
-            $where = $wpdb->prepare( "$operator (
+            $where = $this->db->prepare( "$operator (
                 SELECT 1
-                FROM $wpdb->term_relationships
-                INNER JOIN $wpdb->term_taxonomy
-                ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
-                WHERE $wpdb->term_taxonomy.taxonomy = %s
-                AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
+                FROM {$this->db->term_relationships}
+                INNER JOIN {$this->db->term_taxonomy}
+                ON {$this->db->term_taxonomy}.term_taxonomy_id = {$this->db->term_relationships}.term_taxonomy_id
+                WHERE {$this->db->term_taxonomy}.taxonomy = %s
+                AND {$this->db->term_relationships}.object_id = $this->primary_table.$this->primary_id_column
             )", $clause['taxonomy'] );
 
@@ -598 +603 @@
      * @since 3.2.0
      *
-     * @global wpdb $wpdb The WordPress database abstraction object.
-     *
      * @param array  $query           The single query. Passed by reference.
      * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
@@ -605 +608 @@
      */
     public function transform_query( &$query, $resulting_field ) {
-        global $wpdb;
-
         if ( empty( $query['terms'] ) )
             return;
@@ -629 +630 @@
                 $terms = implode( ",", $query['terms'] );
 
-                $terms = $wpdb->get_col( "
-                    SELECT $wpdb->term_taxonomy.$resulting_field
-                    FROM $wpdb->term_taxonomy
-                    INNER JOIN $wpdb->terms USING (term_id)
+                $terms = $this->db->get_col( "
+                    SELECT {$this->db->term_taxonomy}.$resulting_field
+                    FROM {$this->db->term_taxonomy}
+                    INNER JOIN {$this->db->terms} USING (term_id)
                     WHERE taxonomy = '{$query['taxonomy']}'
-                    AND $wpdb->terms.{$query['field']} IN ($terms)
+                    AND {$this->db->terms}.{$query['field']} IN ($terms)
                 " );
                 break;
             case 'term_taxonomy_id':
                 $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-                $terms = $wpdb->get_col( "
+                $terms = $this->db->get_col( "
                     SELECT $resulting_field
-                    FROM $wpdb->term_taxonomy
+                    FROM {$this->db->term_taxonomy}
                     WHERE term_taxonomy_id IN ($terms)
                 " );
@@ -647 +648 @@
             default:
                 $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-                $terms = $wpdb->get_col( "
+                $terms = $this->db->get_col( "
                     SELECT $resulting_field
-                    FROM $wpdb->term_taxonomy
+                    FROM {$this->db->term_taxonomy}
                     WHERE taxonomy = '{$query['taxonomy']}'
                     AND term_id IN ($terms)

trunk/src/wp-includes/class-wp-term-query.php

@@ -86 +86 @@
      */
     public $terms;
+
+    /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
 
     /**
@@ -173 +180 @@
      */
     public function __construct( $query = '' ) {
+        $this->db = $GLOBALS['wpdb'];
+
         $this->query_var_defaults = array(
             'taxonomy'               => null,
@@ -294 +303 @@
      * @access public
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @return array
      */
     public function get_terms() {
-        global $wpdb;
-
         $this->parse_query( $this->query_vars );
         $args = $this->query_vars;
@@ -487 +492 @@
                 $this->sql_clauses['where']['term_taxonomy_id'] = "tt.term_taxonomy_id IN ({$tt_ids})";
             } else {
-                $this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
+                $this->sql_clauses['where']['term_taxonomy_id'] = $this->db->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
             }
         }
 
         if ( ! empty( $args['name__like'] ) ) {
-            $this->sql_clauses['where']['name__like'] = $wpdb->prepare( "t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
+            $this->sql_clauses['where']['name__like'] = $this->db->prepare( "t.name LIKE %s", '%' . $this->db->esc_like( $args['name__like'] ) . '%' );
         }
 
         if ( ! empty( $args['description__like'] ) ) {
-            $this->sql_clauses['where']['description__like'] = $wpdb->prepare( "tt.description LIKE %s", '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
+            $this->sql_clauses['where']['description__like'] = $this->db->prepare( "tt.description LIKE %s", '%' . $this->db->esc_like( $args['description__like'] ) . '%' );
         }
 
@@ -592 +597 @@
         $fields = implode( ', ', apply_filters( 'get_terms_fields', $selects, $args, $taxonomies ) );
 
-        $join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
+        $join .= " INNER JOIN {$this->db->term_taxonomy} AS tt ON t.term_id = tt.term_id";
 
         $where = implode( ' AND ', $this->sql_clauses['where'] );
@@ -622 +627 @@
 
         $this->sql_clauses['select']  = "SELECT $distinct $fields";
-        $this->sql_clauses['from']    = "FROM $wpdb->terms AS t $join";
+        $this->sql_clauses['from']    = "FROM {$this->db->terms} AS t $join";
         $this->sql_clauses['orderby'] = $orderby ? "$orderby $order" : '';
         $this->sql_clauses['limits']  = $limits;
@@ -647 +652 @@
 
         if ( 'count' == $_fields ) {
-            return $wpdb->get_var( $this->request );
-        }
-
-        $terms = $wpdb->get_results( $this->request );
+            return $this->db->get_var( $this->request );
+        }
+
+        $terms = $this->db->get_results( $this->request );
         if ( 'all' == $_fields ) {
             update_term_cache( $terms );
@@ -753 +758 @@
      * @since 4.6.0
      * @access protected
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      *
      * @param string $orderby_raw Alias for the field to order by.
@@ -895 +898 @@
      * @access protected
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param string $string
      * @return string
      */
     protected function get_search_sql( $string ) {
-        global $wpdb;
-
-        $like = '%' . $wpdb->esc_like( $string ) . '%';
-
-        return $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
+        $like = '%' . $this->db->esc_like( $string ) . '%';
+
+        return $this->db->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
     }
 }

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

@@ -72 +72 @@
 
     /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
+
+    /**
      * PHP5 constructor.
      *
@@ -79 +86 @@
      */
     public function __construct( $query = null ) {
+        $this->db = $GLOBALS['wpdb'];
+
         if ( ! empty( $query ) ) {
             $this->prepare_query( $query );
@@ -135 +144 @@
      * @access public
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
      * @global int  $blog_id
      *
@@ -199 +207 @@
      */
     public function prepare_query( $query = array() ) {
-        global $wpdb;
-
         if ( empty( $this->query_vars ) || ! empty( $query ) ) {
             $this->query_limit = null;
@@ -229 +235 @@
             foreach ( $qv['fields'] as $field ) {
                 $field = 'ID' === $field ? 'ID' : sanitize_key( $field );
-                $this->query_fields[] = "$wpdb->users.$field";
+                $this->query_fields[] = "{$this->db->users}.$field";
             }
             $this->query_fields = implode( ',', $this->query_fields );
         } elseif ( 'all' == $qv['fields'] ) {
-            $this->query_fields = "$wpdb->users.*";
+            $this->query_fields = "{$this->db->users}.*";
         } else {
-            $this->query_fields = "$wpdb->users.ID";
+            $this->query_fields = "{$this->db->users}.ID";
         }
 
@@ -241 +247 @@
             $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 
-        $this->query_from = "FROM $wpdb->users";
+        $this->query_from = "FROM {$this->db->users}";
         $this->query_where = "WHERE 1=1";
 
@@ -264 +270 @@
 
             foreach ( $post_types as &$post_type ) {
-                $post_type = $wpdb->prepare( '%s', $post_type );
-            }
-
-            $posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
-            $this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
+                $post_type = $this->db->prepare( '%s', $post_type );
+            }
+
+            $posts_table = $this->db->get_blog_prefix( $blog_id ) . 'posts';
+            $this->query_where .= " AND {$this->db->users}.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
         }
 
@@ -277 +283 @@
         if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
             $who_query = array(
-                'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
+                'key' => $this->db->get_blog_prefix( $blog_id ) . 'user_level',
                 'value' => 0,
                 'compare' => '!=',
@@ -324 +330 @@
                 foreach ( $roles as $role ) {
                     $roles_clauses[] = array(
-                        'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                        'key'     => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
                         'value'   => '"' . $role . '"',
                         'compare' => 'LIKE',
@@ -337 +343 @@
                 foreach ( $role__in as $role ) {
                     $role__in_clauses[] = array(
-                        'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                        'key'     => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
                         'value'   => '"' . $role . '"',
                         'compare' => 'LIKE',
@@ -350 +356 @@
                 foreach ( $role__not_in as $role ) {
                     $role__not_in_clauses[] = array(
-                        'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                        'key'     => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
                         'value'   => '"' . $role . '"',
                         'compare' => 'NOT LIKE',
@@ -362 +368 @@
             if ( empty( $role_queries ) ) {
                 $role_queries[] = array(
-                    'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                    'key' => $this->db->get_blog_prefix( $blog_id ) . 'capabilities',
                     'compare' => 'EXISTS',
                 );
@@ -384 +390 @@
 
         if ( ! empty( $this->meta_query->queries ) ) {
-            $clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
+            $clauses = $this->meta_query->get_sql( 'user', $this->db->users, 'ID', $this );
             $this->query_from .= $clauses['join'];
             $this->query_where .= $clauses['where'];
@@ -442 +448 @@
         if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
             if ( $qv['offset'] ) {
-                $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
+                $this->query_limit = $this->db->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
             } else {
-                $this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+                $this->query_limit = $this->db->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
             }
         }
@@ -500 +506 @@
             // Sanitized earlier.
             $ids = implode( ',', $include );
-            $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
+            $this->query_where .= " AND {$this->db->users}.ID IN ($ids)";
         } elseif ( ! empty( $qv['exclude'] ) ) {
             $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
-            $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
+            $this->query_where .= " AND {$this->db->users}.ID NOT IN ($ids)";
         }
 
@@ -531 +537 @@
      *
      * @since 3.1.0
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      */
     public function query() {
-        global $wpdb;
-
         $qv =& $this->query_vars;
 
@@ -542 +544 @@
 
         if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
-            $this->results = $wpdb->get_results( $this->request );
+            $this->results = $this->db->get_results( $this->request );
         } else {
-            $this->results = $wpdb->get_col( $this->request );
+            $this->results = $this->db->get_col( $this->request );
         }
 
@@ -552 +554 @@
          * @since 3.2.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
          */
-        if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-            $this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
-
-        if ( !$this->results )
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+            $this->total_users = $this->db->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+        }
+
+        if ( ! $this->results ) {
             return;
+        }
 
         if ( 'all_with_meta' == $qv['fields'] ) {
@@ -611 +613 @@
      * @access protected
      * @since 3.1.0
-     *
-     * @global wpdb $wpdb WordPress database abstraction object.
      *
      * @param string $string
@@ -621 +621 @@
      */
     protected function get_search_sql( $string, $cols, $wild = false ) {
-        global $wpdb;
-
         $searches = array();
         $leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
         $trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
-        $like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
+        $like = $leading_wild . $this->db->esc_like( $string ) . $trailing_wild;
 
         foreach ( $cols as $col ) {
             if ( 'ID' == $col ) {
-                $searches[] = $wpdb->prepare( "$col = %s", $string );
+                $searches[] = $this->db->prepare( "$col = %s", $string );
             } else {
-                $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+                $searches[] = $this->db->prepare( "$col LIKE %s", $like );
             }
         }
@@ -669 +667 @@
      * @access protected
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param string $orderby Alias for the field to order by.
      * @return string Value to used in the ORDER clause, if `$orderby` is valid.
      */
     protected function parse_orderby( $orderby ) {
-        global $wpdb;
-
         $meta_query_clauses = $this->meta_query->get_clauses();
 
@@ -691 +685 @@
             $this->query_from .= " LEFT OUTER JOIN (
                 SELECT post_author, COUNT(*) as post_count
-                FROM $wpdb->posts
+                FROM {$this->db->posts}
                 $where
                 GROUP BY post_author
-            ) p ON ({$wpdb->users}.ID = p.post_author)
+            ) p ON ({$this->db->users}.ID = p.post_author)
             ";
             $_orderby = 'post_count';
@@ -700 +694 @@
             $_orderby = 'ID';
         } elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
-            $_orderby = "$wpdb->usermeta.meta_value";
+            $_orderby = "{$this->db->usermeta}.meta_value";
         } elseif ( 'meta_value_num' == $orderby ) {
-            $_orderby = "$wpdb->usermeta.meta_value+0";
+            $_orderby = "{$this->db->usermeta}.meta_value+0";
         } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
             $include = wp_parse_id_list( $this->query_vars['include'] );
             $include_sql = implode( ',', $include );
-            $_orderby = "FIELD( $wpdb->users.ID, $include_sql )";
+            $_orderby = "FIELD( {$this->db->users}.ID, $include_sql )";
         } elseif ( isset( $meta_query_clauses[ $orderby ] ) ) {
             $meta_clause = $meta_query_clauses[ $orderby ];

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 );
     }

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -55 +55 @@
 
     /**
+     * @since 4.7.0
+     * @access protected
+     * @var wpdb
+     */
+    protected $db;
+
+    /**
      * Registers all of the XMLRPC methods that XMLRPC server understands.
      *
@@ -64 +71 @@
      */
     public function __construct() {
+        $this->db = $GLOBALS['wpdb'];
+
         $this->methods = array(
             // WordPress API
@@ -2883 +2892 @@
      * @since 2.2.0
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param array  $args {
      *     Method arguments. Note: arguments must be ordered as documented.
@@ -2895 +2902 @@
      */
     public function wp_getPageList( $args ) {
-        global $wpdb;
-
         $this->escape( $args );
 
@@ -2912 +2917 @@
 
         // Get list of pages ids and titles
-        $page_list = $wpdb->get_results("
+        $page_list = $this->db->get_results("
             SELECT ID page_id,
                 post_title page_title,
@@ -2919 +2924 @@
                 post_date,
                 post_status
-            FROM {$wpdb->posts}
+            FROM {$this->db->posts}
             WHERE post_type = 'page'
             ORDER BY ID
@@ -5131 +5136 @@
      * @since 2.1.0
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param int $post_ID Post ID.
      * @param string $post_content Post Content for attachment.
      */
     public function attach_uploads( $post_ID, $post_content ) {
-        global $wpdb;
-
         // find any unattached files
-        $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
+        $attachments = $this->db->get_results( "SELECT ID, guid FROM {$this->db->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
         if ( is_array( $attachments ) ) {
             foreach ( $attachments as $file ) {
-                if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
-                    $wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+                if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
+                    $this->db->update( $this->db->posts, array( 'post_parent' => $post_ID ), array( 'ID' => $file->ID ) );
+                }
             }
         }
@@ -5764 +5766 @@
      * @since 1.5.0
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param array  $args {
      *     Method arguments. Note: arguments must be ordered as documented.
@@ -5777 +5777 @@
      */
     public function mw_newMediaObject( $args ) {
-        global $wpdb;
-
         $username = $this->escape( $args[1] );
         $password = $this->escape( $args[2] );
@@ -6103 +6101 @@
      * @since 1.5.0
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param int $post_ID
      * @return array|IXR_Error
      */
     public function mt_getTrackbackPings( $post_ID ) {
-        global $wpdb;
-
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
@@ -6119 +6113 @@
             return new IXR_Error(404, __('Sorry, no such post.'));
 
-        $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+        $comments = $this->db->get_results( $this->db->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM {$this->db->comments} WHERE comment_post_ID = %d", $post_ID) );
 
         if ( !$comments )
@@ -6193 +6187 @@
      * @since 1.5.0
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
      * @global string $wp_version
      *
@@ -6205 +6198 @@
      */
     public function pingback_ping( $args ) {
-        global $wpdb, $wp_version;
+        global $wp_version;
 
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
@@ -6259 +6252 @@
                 // ...or a string #title, a little more complicated
                 $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
-                $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
-                if (! ($post_ID = $wpdb->get_var($sql)) ) {
+                $sql = $this->db->prepare("SELECT ID FROM {$this->db->posts} WHERE post_title RLIKE %s", $title );
+                if (! ($post_ID = $this->db->get_var($sql)) ) {
                     // returning unknown error '0' is better than die()ing
                     return $this->pingback_error( 0, '' );
@@ -6284 +6277 @@
 
         // Let's check that the remote site didn't already pingback this entry
-        if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
+        if ( $this->db->get_results( $this->db->prepare("SELECT * FROM {$this->db->comments} WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
             return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
 
@@ -6409 +6402 @@
      * @since 1.5.0
      *
-     * @global wpdb $wpdb WordPress database abstraction object.
-     *
      * @param string $url
      * @return array|IXR_Error
      */
     public function pingback_extensions_getPingbacks( $url ) {
-        global $wpdb;
-
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'pingback.extensions.getPingbacks' );
@@ -6435 +6424 @@
         }
 
-        $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+        $comments = $this->db->get_results( $this->db->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM {$this->db->comments} WHERE comment_post_ID = %d", $post_ID) );
 
         if ( !$comments )