Ticket #37699: 37699.diff

src/wp-includes/author-template.php

@@ -332 +332 @@
  *
  * @since 1.2.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string|array $args {
  *     Optional. Array or string of default arguments.
  *
@@ -361 +359 @@
  * @return string|void The output, if echo is set to false.
  */
 function wp_list_authors( $args = '' ) {
-        global $wpdb;
-
         $defaults = array(
                 'orderby' => 'name', 'order' => 'ASC', 'number' => '',
                 'optioncount' => false, 'exclude_admin' => true,
@@ -379 +375 @@
         $query_args['fields'] = 'ids';
         $authors = get_users( $query_args );
 
+        $wpdb = WP::get( 'wpdb' );
         $author_count = array();
         foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author" ) as $row ) {
                 $author_count[$row->post_author] = $row->count;
@@ -466 +463 @@
  *
  * @since 3.2.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return bool Whether or not we have more than one author
  */
 function is_multi_author() {
-        global $wpdb;
-
         if ( false === ( $is_multi_author = get_transient( 'is_multi_author' ) ) ) {
+                $wpdb = WP::get( 'wpdb' );
                 $rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
                 $is_multi_author = 1 < count( $rows ) ? 1 : 0;
                 set_transient( 'is_multi_author', $is_multi_author );

src/wp-includes/bookmark.php

@@ -11 +11 @@
  *
  * @since 2.1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|stdClass $bookmark
  * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
  * @param string $filter Optional, default is 'raw'.
@@ -19 +17 @@
  * @return array|object|null Type returned depends on $output value.
  */
 function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
-        global $wpdb;
-
         if ( empty($bookmark) ) {
                 if ( isset($GLOBALS['link']) )
                         $_bookmark = & $GLOBALS['link'];
@@ -33 +29 @@
                 if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
                         $_bookmark = & $GLOBALS['link'];
                 } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
                         if ( $_bookmark ) {
                                 $_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
@@ -92 +89 @@
  *
  * @since 2.1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string|array $args {
  *     Optional. String or array of arguments to retrieve bookmarks.
  *
@@ -115 +110 @@
  * @return array List of bookmark row objects.
  */
 function get_bookmarks( $args = '' ) {
-        global $wpdb;
-
         $defaults = array(
                 'orderby' => 'name', 'order' => 'ASC',
                 'limit' => -1, 'category' => '',
@@ -203 +196 @@
                 }
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $search = '';
         if ( ! empty( $r['search'] ) ) {
                 $like = '%' . $wpdb->esc_like( $r['search'] ) . '%';

src/wp-includes/canonical.php

@@ -31 +31 @@
  * @global WP_Rewrite $wp_rewrite
  * @global bool $is_IIS
  * @global WP_Query $wp_query
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $requested_url Optional. The URL that was requested, used to
  *              figure if redirect is needed.
@@ -39 +38 @@
  * @return string|void The string of the URL, if redirect needed.
  */
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
-        global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
+        global $wp_rewrite, $is_IIS, $wp_query, $wp;
 
         if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
                 return;
@@ -98 +97 @@
         }
 
         if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
-
+                $wpdb = WP::get( 'wpdb' );
                 $vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
 
                 if ( isset($vars[0]) && $vars = $vars[0] ) {
@@ -204 +203 @@
                                 $redirect['query'] = remove_query_arg('year', $redirect['query']);
                 } elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
                         $author = get_userdata(get_query_var('author'));
+                        $wpdb = WP::get( 'wpdb' );
                         if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
                                 if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
                                         $redirect['query'] = remove_query_arg('author', $redirect['query']);
@@ -581 +581 @@
  *
  * @since 2.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return false|string The correct URL if one is found. False on failure.
  */
 function redirect_guess_404_permalink() {
-        global $wpdb;
-
         if ( get_query_var('name') ) {
+                $wpdb = WP::get( 'wpdb' );
                 $where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
 
                 // if any of post_type, year, monthnum, or day are set, use them to refine the query

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

@@ -141 +141 @@
                 return false;
         }
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -260 +262 @@
          * }
          */
         public function __construct( $query = '' ) {
+                $this->dbh = WP::get( 'wpdb' );
+
                 $this->query_var_defaults = array(
                         'author_email' => '',
                         'author_url' => '',
@@ -363 +367 @@
          * @since 4.2.0
          * @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();
 
                 // Parse meta query
@@ -388 +388 @@
                 // Reparse query vars, in case they were modified in a 'pre_get_comments' callback.
                 $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->dbh->comments, 'comment_ID', $this );
                 }
 
                 // $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
@@ -480 +480 @@
          *
          * @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();
 
@@ -514 +510 @@
                                                 break;
 
                                         default :
-                                                $status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+                                                $status_clauses[] = $this->dbh->prepare( "comment_approved = %s", $status );
                                                 break;
                                 }
                         }
@@ -537 +533 @@
                         foreach ( $include_unapproved as $unapproved_identifier ) {
                                 // 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->dbh->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->dbh->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
                                 }
                         }
                 }
@@ -600 +596 @@
 
                         // 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->dbh->comments}.comment_date_gmt $order";
                         }
 
                         // To ensure determinate sorting, always include a comment_ID clause.
@@ -633 +629 @@
                                         $comment_ID_order = 'DESC';
                                 }
 
-                                $orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
+                                $orderby_array[] = "{$this->dbh->comments}.comment_ID $comment_ID_order";
                         }
 
                         $orderby = implode( ', ', $orderby_array );
                 } else {
-                        $orderby = "$wpdb->comments.comment_date_gmt $order";
+                        $orderby = "{$this->dbh->comments}.comment_date_gmt $order";
                 }
 
                 $number = absint( $this->query_vars['number'] );
@@ -655 +651 @@
                 if ( $this->query_vars['count'] ) {
                         $fields = 'COUNT(*)';
                 } else {
-                        $fields = "$wpdb->comments.comment_ID";
+                        $fields = "{$this->dbh->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->dbh->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->dbh->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->dbh->comments}.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
                 }
 
                 // Parse comment parent IDs for an IN clause.
@@ -694 +690 @@
                 }
 
                 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->dbh->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->dbh->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->dbh->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
                 }
 
                 // Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
@@ -733 +729 @@
                                                 break;
 
                                         default:
-                                                $comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
+                                                $comment_types[ $operator ][] = $this->dbh->prepare( '%s', $type );
                                                 break;
                                 }
                         }
@@ -750 +746 @@
                 }
 
                 if ( '' !== $parent ) {
-                        $this->sql_clauses['where']['parent'] = $wpdb->prepare( 'comment_parent = %d', $parent );
+                        $this->sql_clauses['where']['parent'] = $this->dbh->prepare( 'comment_parent = %d', $parent );
                 }
 
                 if ( is_array( $this->query_vars['user_id'] ) ) {
                         $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->dbh->prepare( 'user_id = %d', $this->query_vars['user_id'] );
                 }
 
                 // Falsy search strings are ignored.
@@ -780 +776 @@
                         foreach ( $post_fields as $field_name => $field_value ) {
                                 // $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->dbh->prepare( " {$this->dbh->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
                         }
                 }
 
@@ -801 +797 @@
                                 $join_posts_table = true;
 
                                 $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->dbh->prepare( " {$this->dbh->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
                         }
                 }
 
@@ -830 +826 @@
                 $join = '';
 
                 if ( $join_posts_table ) {
-                        $join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
+                        $join .= "JOIN {$this->dbh->posts} ON {$this->dbh->posts}.ID = {$this->dbh->comments}.comment_post_ID";
                 }
 
                 if ( ! empty( $this->meta_query_clauses ) ) {
@@ -840 +836 @@
                         $this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $this->meta_query_clauses['where'] );
 
                         if ( ! $this->query_vars['count'] ) {
-                                $groupby = "{$wpdb->comments}.comment_ID";
+                                $groupby = "{$this->dbh->comments}.comment_ID";
                         }
                 }
 
@@ -889 +885 @@
                 }
 
                 $this->sql_clauses['select']  = "SELECT $found_rows $fields";
-                $this->sql_clauses['from']    = "FROM $wpdb->comments $join";
+                $this->sql_clauses['from']    = "FROM {$this->dbh->comments} $join";
                 $this->sql_clauses['groupby'] = $groupby;
                 $this->sql_clauses['orderby'] = $orderby;
                 $this->sql_clauses['limits']  = $limits;
@@ -897 +893 @@
                 $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
                 if ( $this->query_vars['count'] ) {
-                        return intval( $wpdb->get_var( $this->request ) );
+                        return intval( $this->dbh->get_var( $this->request ) );
                 } else {
-                        $comment_ids = $wpdb->get_col( $this->request );
+                        $comment_ids = $this->dbh->get_col( $this->request );
                         return array_map( 'intval', $comment_ids );
                 }
         }
@@ -910 +906 @@
          *
          * @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'] ) {
                         /**
                          * Filters the query used to retrieve found comment count.
@@ -927 +919 @@
                          */
                         $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->dbh->get_var( $found_comments_query );
                 }
         }
 
@@ -943 +935 @@
          * @return array
          */
         protected function fill_descendants( $comments ) {
-                global $wpdb;
-
                 $levels = array(
                         0 => wp_list_pluck( $comments, 'comment_ID' ),
                 );
@@ -996 +986 @@
 
                         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->dbh->get_results( "SELECT {$this->dbh->comments}.comment_ID, {$this->dbh->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.
                                 $parent_map = array_fill_keys( $uncached_parent_ids, array() );
@@ -1067 +1057 @@
          * @since 3.1.0
          * @access protected
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $string
          * @param array $cols
          * @return string
          */
         protected function get_search_sql( $string, $cols ) {
-                global $wpdb;
+                $like = '%' . $this->dbh->esc_like( $string ) . '%';
 
-                $like = '%' . $wpdb->esc_like( $string ) . '%';
-
                 $searches = array();
                 foreach ( $cols as $col ) {
-                        $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+                        $searches[] = $this->dbh->prepare( "$col LIKE %s", $like );
                 }
 
                 return ' AND (' . implode(' OR ', $searches) . ')';
@@ -1092 +1078 @@
          * @since 4.2.0
          * @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',
                         'comment_approved',
@@ -1131 +1113 @@
 
                 $parsed = false;
                 if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
-                        $parsed = "$wpdb->commentmeta.meta_value";
+                        $parsed = "{$this->dbh->commentmeta}.meta_value";
                 } elseif ( $orderby == 'meta_value_num' ) {
-                        $parsed = "$wpdb->commentmeta.meta_value+0";
+                        $parsed = "{$this->dbh->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->dbh->comments}.comment_ID, $comment__in )";
                 } elseif ( in_array( $orderby, $allowed_keys ) ) {
 
                         if ( isset( $meta_query_clauses[ $orderby ] ) ) {
@@ -1143 +1125 @@
                                 $meta_clause = $meta_query_clauses[ $orderby ];
                                 $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->dbh->comments}.$orderby";
                         }
                 }
 

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

@@ -183 +183 @@
          * @access public
          * @static
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param int $id Comment ID.
          * @return WP_Comment|false Comment object, otherwise false.
          */
         public static function get_instance( $id ) {
-                global $wpdb;
-
                 $comment_id = (int) $id;
                 if ( ! $comment_id ) {
                         return false;
@@ -199 +195 @@
                 $_comment = wp_cache_get( $comment_id, 'comment' );
 
                 if ( ! $_comment ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $_comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id ) );
 
                         if ( ! $_comment ) {

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

@@ -105 +105 @@
          */
         protected $has_or_relation = false;
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -137 +139 @@
          * }
          */
         public function __construct( $meta_query = false ) {
+                $this->dbh = WP::get( 'wpdb' );
+
                 if ( !$meta_query )
                         return;
 
@@ -484 +488 @@
          * @since 4.1.0
          * @access public
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param array  $clause       Query clause, passed by reference.
          * @param array  $parent_query Parent query array.
          * @param string $clause_key   Optional. The array key used to name the clause in the original `$meta_query`
@@ -498 +500 @@
          * }
          */
         public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
-                global $wpdb;
-
                 $sql_chunks = array(
                         'where' => array(),
                         'join' => array(),
@@ -537 +537 @@
                         if ( 'NOT EXISTS' === $meta_compare ) {
                                 $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->dbh->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.
                         } else {
@@ -581 +581 @@
                         if ( 'NOT EXISTS' === $meta_compare ) {
                                 $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->dbh->prepare( "{$alias}.meta_key = %s", trim( $clause['key'] ) );
                         }
                 }
 
@@ -601 +601 @@
                                 case 'IN' :
                                 case 'NOT IN' :
                                         $meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
-                                        $where = $wpdb->prepare( $meta_compare_string, $meta_value );
+                                        $where = $this->dbh->prepare( $meta_compare_string, $meta_value );
                                         break;
 
                                 case 'BETWEEN' :
                                 case 'NOT BETWEEN' :
                                         $meta_value = array_slice( $meta_value, 0, 2 );
-                                        $where = $wpdb->prepare( '%s AND %s', $meta_value );
+                                        $where = $this->dbh->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->dbh->esc_like( $meta_value ) . '%';
+                                        $where = $this->dbh->prepare( '%s', $meta_value );
                                         break;
 
                                 // EXISTS with a value is interpreted as '='.
                                 case 'EXISTS' :
                                         $meta_compare = '=';
-                                        $where = $wpdb->prepare( '%s', $meta_value );
+                                        $where = $this->dbh->prepare( '%s', $meta_value );
                                         break;
 
                                 // 'value' is ignored for NOT EXISTS.
@@ -628 +628 @@
                                         break;
 
                                 default :
-                                        $where = $wpdb->prepare( '%s', $meta_value );
+                                        $where = $this->dbh->prepare( '%s', $meta_value );
                                         break;
 
                         }

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

@@ -86 +86 @@
          */
         public $max_num_pages = 0;
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -124 +126 @@
          * }
          */
         public function __construct( $query = '' ) {
+                $this->dbh = WP::get( 'wpdb' );
+
                 $this->query_var_defaults = array(
                         'network__in'          => '',
                         'network__not_in'      => '',
@@ -290 +294 @@
          * @return int|array A single count of network IDs if a count query. An array of network IDs if a full query.
          */
         protected function get_network_ids() {
-                global $wpdb;
-
                 $order = $this->parse_order( $this->query_vars['order'] );
 
                 // Disable ORDER BY with 'none', an empty array, or boolean false.
@@ -332 +334 @@
 
                         $orderby = implode( ', ', $orderby_array );
                 } else {
-                        $orderby = "$wpdb->site.id $order";
+                        $orderby = "{$this->dbh->site}.id $order";
                 }
 
                 $number = absint( $this->query_vars['number'] );
@@ -349 +351 @@
                 if ( $this->query_vars['count'] ) {
                         $fields = 'COUNT(*)';
                 } else {
-                        $fields = "$wpdb->site.id";
+                        $fields = "{$this->dbh->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->dbh->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->dbh->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->dbh->prepare( "{$this->dbh->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->dbh->site}.domain IN ( '" . implode( "', '", $this->dbh->_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->dbh->site}.domain NOT IN ( '" . implode( "', '", $this->dbh->_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->dbh->prepare( "{$this->dbh->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->dbh->site}.path IN ( '" . implode( "', '", $this->dbh->_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->dbh->site}.path NOT IN ( '" . implode( "', '", $this->dbh->_escape( $this->query_vars['path__not_in'] ) ) . "' )";
                 }
 
                 // Falsey search strings are ignored.
@@ -394 +396 @@
                 if ( strlen( $this->query_vars['search'] ) ) {
                         $this->sql_clauses['where']['search'] = $this->get_search_sql(
                                 $this->query_vars['search'],
-                                array( "$wpdb->site.domain", "$wpdb->site.path" )
+                                array( "{$this->dbh->site}.domain", "{$this->dbh->site}.path" )
                         );
                 }
 
@@ -439 +441 @@
                 }
 
                 $this->sql_clauses['select']  = "SELECT $found_rows $fields";
-                $this->sql_clauses['from']    = "FROM $wpdb->site $join";
+                $this->sql_clauses['from']    = "FROM {$this->dbh->site} $join";
                 $this->sql_clauses['groupby'] = $groupby;
                 $this->sql_clauses['orderby'] = $orderby;
                 $this->sql_clauses['limits']  = $limits;
@@ -447 +449 @@
                 $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
                 if ( $this->query_vars['count'] ) {
-                        return intval( $wpdb->get_var( $this->request ) );
+                        return intval( $this->dbh->get_var( $this->request ) );
                 }
 
-                $network_ids = $wpdb->get_col( $this->request );
+                $network_ids = $this->dbh->get_col( $this->request );
 
                 return array_map( 'intval', $network_ids );
         }
@@ -461 +463 @@
          *
          * @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'] ) {
                         /**
                          * Filters the query used to retrieve found network count.
@@ -478 +476 @@
                          */
                         $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->dbh->get_var( $found_networks_query );
                 }
         }
 
@@ -488 +486 @@
          * @since 4.6.0
          * @access protected
          *
-         * @global wpdb  $wpdb WordPress database abstraction object.
-         *
          * @param string $string  Search string.
          * @param array  $columns Columns to search.
          *
@@ -496 +492 @@
          * @return string Search SQL.
          */
         protected function get_search_sql( $string, $columns ) {
-                global $wpdb;
+                $like = '%' . $this->dbh->esc_like( $string ) . '%';
 
-                $like = '%' . $wpdb->esc_like( $string ) . '%';
-
                 $searches = array();
                 foreach ( $columns as $column ) {
-                        $searches[] = $wpdb->prepare( "$column LIKE %s", $like );
+                        $searches[] = $this->dbh->prepare( "$column LIKE %s", $like );
                 }
 
                 return '(' . implode( ' OR ', $searches ) . ')';
@@ -514 +508 @@
          * @since 4.6.0
          * @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(
                         'id',
                         'domain',
@@ -531 +521 @@
                 $parsed = false;
                 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->dbh->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->dbh->site}.$field)";
                 } elseif ( in_array( $orderby, $allowed_keys ) ) {
-                        $parsed = "$wpdb->site.$orderby";
+                        $parsed = "{$this->dbh->site}.$orderby";
                 }
 
                 return $parsed;

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

@@ -87 +87 @@
          */
         public $site_name = '';
 
+        protected $dbh;
+
         /**
          * Retrieve a network from the database by its ID.
          *
@@ -93 +95 @@
          * @since 4.4.0
          * @access public
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param int $network_id The ID of the network to retrieve.
          * @return WP_Network|bool The network's object if found. False if not.
          */
         public static function get_instance( $network_id ) {
-                global $wpdb;
-
                 $network_id = (int) $network_id;
                 if ( ! $network_id ) {
                         return false;
@@ -109 +107 @@
                 $_network = wp_cache_get( $network_id, 'networks' );
 
                 if ( ! $_network ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $_network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->site} WHERE id = %d LIMIT 1", $network_id ) );
 
                         if ( empty( $_network ) || is_wp_error( $_network ) ) {
@@ -137 +136 @@
                         $this->$key = $value;
                 }
 
+                $this->dbh = WP::get( 'wpdb' );
+
                 $this->_set_site_name();
                 $this->_set_cookie_domain();
         }
@@ -267 +268 @@
          * @return WP_Network|bool Network object if successful. False when no network is found.
          */
         public static function get_by_path( $domain = '', $path = '', $segments = null ) {
-                global $wpdb;
-
                 $domains = array( $domain );
                 $pieces  = explode( '.', $domain );
 
@@ -295 +294 @@
                 if ( wp_using_ext_object_cache() ) {
                         $using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
                         if ( false === $using_paths ) {
-                                $using_paths = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} WHERE path <> '/' LIMIT 1" );
+                                $using_paths = (int) $this->dbh->get_var( "SELECT id FROM {$this->dbh->site} WHERE path <> '/' LIMIT 1" );
                                 wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
                         }
                 }
@@ -356 +355 @@
                 // @todo Consider additional optimization routes, perhaps as an opt-in for plugins.
                 // We already have paths covered. What about how far domains should be drilled down (including www)?
 
-                $search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
+                $search_domains = "'" . implode( "', '", $this->dbh->_escape( $domains ) ) . "'";
 
                 if ( ! $using_paths ) {
-                        $network = $wpdb->get_row( "
-                                SELECT * FROM {$wpdb->site}
+                        $network = $this->dbh->get_row( "
+                                SELECT * FROM {$this->dbh->site}
                                 WHERE domain IN ({$search_domains})
                                 ORDER BY CHAR_LENGTH(domain)
                                 DESC LIMIT 1
@@ -373 +372 @@
                         return false;
 
                 } else {
-                        $search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
-                        $networks = $wpdb->get_results( "
-                                SELECT * FROM {$wpdb->site}
+                        $search_paths = "'" . implode( "', '", $this->dbh->_escape( $paths ) ) . "'";
+                        $networks = $this->dbh->get_results( "
+                                SELECT * FROM {$this->dbh->site}
                                 WHERE domain IN ({$search_domains})
                                 AND path IN ({$search_paths})
                                 ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC

src/wp-includes/class-wp-post.php

@@ -202 +202 @@
          * @static
          * @access public
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param int $post_id Post ID.
          * @return WP_Post|false Post object, false otherwise.
          */
         public static function get_instance( $post_id ) {
-                global $wpdb;
-
                 $post_id = (int) $post_id;
                 if ( ! $post_id )
                         return false;
@@ -217 +213 @@
                 $_post = wp_cache_get( $post_id, 'posts' );
 
                 if ( ! $_post ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
                         if ( ! $_post )

src/wp-includes/class-wp-registry.php

@@ +1 @@
+<?php
+
+class WP_Registry {
+        private $data = array();
+        private static $instance;
+
+        public static function instance() {
+                if ( ! self::$instance ) {
+                        self::$instance = new self;
+                }
+                return self::$instance;
+        }
+
+        private function __construct() {}
+
+        private function __clone() {}
+
+        public function get( $key, $global = true ) {
+                if ( $global && array_key_exists( $key, $GLOBALS ) ) {
+                        return $GLOBALS[ $key ];
+                } elseif ( array_key_exists( $key, $this->data ) ) {
+                        return $this->data[ $key ];
+                }
+
+                return $this->set( $key, null, $global );
+        }
+
+        public function set( $key, $value = null, $global = false ) {
+                if ( null === $value ) {
+                        switch ( $key ) {
+                        case 'wp_hasher':
+                                require_once ABSPATH . WPINC . '/class-phpass.php';
+                                $value = new PasswordHash( 8, true );
+                                break;
+                        }
+                }
+                $this->data[ $key ] = $value;
+                if ( $global ) {
+                        $GLOBALS[ $key ] = $this->data[ $key ];
+                }
+                return $value;
+        }
+}
+ No newline at end of file

src/wp-includes/class-wp-rewrite.php

@@ -450 +450 @@
          * @since 2.5.0
          * @access public
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @return array Array of page URIs as first element and attachment URIs as second element.
          */
         public function page_uri_index() {
-                global $wpdb;
+                $wpdb = WP::get( 'wpdb' );
 
                 // Get pages in order of hierarchy, i.e. children after parents.
                 $pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'");

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

@@ -105 +105 @@
          * @since 2.1.0
          * @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;
+                global $wp_user_roles;
+                $wpdb = WP::get( 'wpdb' );
                 $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
                 if ( ! empty( $wp_user_roles ) ) {
                         $this->roles = $wp_user_roles;
@@ -137 +137 @@
          *
          * @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.
@@ -145 +143 @@
                 if ( ! $this->use_db )
                         return;
 
-                global $wpdb;
+                $wpdb = WP::get( 'wpdb' );
 
                 // Duplicated from _init() to avoid an extra function call.
                 $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';

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

@@ -95 +95 @@
          */
         public $max_num_pages = 0;
 
+        protected $dbh;
+
         /**
          * Sets up the site query, based on the query vars passed.
          *
@@ -147 +149 @@
          * }
          */
         public function __construct( $query = '' ) {
+                $this->dbh = WP::get( 'wpdb' );
+
                 $this->query_var_defaults = array(
                         'fields'            => '',
                         'ID'                => '',
@@ -325 +329 @@
          * @since 4.6.0
          * @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'] );
 
                 // Disable ORDER BY with 'none', an empty array, or boolean false.
@@ -395 +395 @@
                 // Parse site IDs for an IN clause.
                 $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->dbh->prepare( 'blog_id = %d', $site_id );
                 }
 
                 // Parse site IDs for an IN clause.
@@ -411 +411 @@
                 $network_id = absint( $this->query_vars['network_id'] );
 
                 if ( ! empty( $network_id ) ) {
-                        $this->sql_clauses['where']['network_id'] = $wpdb->prepare( 'site_id = %d', $network_id );
+                        $this->sql_clauses['where']['network_id'] = $this->dbh->prepare( 'site_id = %d', $network_id );
                 }
 
                 // Parse site network IDs for an IN clause.
@@ -425 +425 @@
                 }
 
                 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->dbh->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->dbh->_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->dbh->_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->dbh->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->dbh->_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->dbh->_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->dbh->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->dbh->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->dbh->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->dbh->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->dbh->prepare( "public = %d ", $public );
                 }
 
                 // Falsey search strings are ignored.
@@ -550 +550 @@
                 }
 
                 $this->sql_clauses['select']  = "SELECT $found_rows $fields";
-                $this->sql_clauses['from']    = "FROM $wpdb->blogs $join";
+                $this->sql_clauses['from']    = "FROM {$this->dbh->blogs} $join";
                 $this->sql_clauses['groupby'] = $groupby;
                 $this->sql_clauses['orderby'] = $orderby;
                 $this->sql_clauses['limits']  = $limits;
@@ -558 +558 @@
                 $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
                 if ( $this->query_vars['count'] ) {
-                        return intval( $wpdb->get_var( $this->request ) );
+                        return intval( $this->dbh->get_var( $this->request ) );
                 }
 
-                $site_ids = $wpdb->get_col( $this->request );
+                $site_ids = $this->dbh->get_col( $this->request );
 
                 return array_map( 'intval', $site_ids );
         }
@@ -572 +572 @@
          *
          * @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'] ) {
                         /**
                          * Filters the query used to retrieve found site count.
@@ -589 +585 @@
                          */
                         $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->dbh->get_var( $found_sites_query );
                 }
         }
 
@@ -599 +595 @@
          * @since 4.6.0
          * @access protected
          *
-         * @global wpdb  $wpdb WordPress database abstraction object.
-         *
          * @param string $string  Search string.
          * @param array  $columns Columns to search.
          * @return string Search SQL.
          */
         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->dbh, 'esc_like' ), explode( '*', $string ) ) ) . '%';
                 } else {
-                        $like = '%' . $wpdb->esc_like( $string ) . '%';
+                        $like = '%' . $this->dbh->esc_like( $string ) . '%';
                 }
 
                 $searches = array();
                 foreach ( $columns as $column ) {
-                        $searches[] = $wpdb->prepare( "$column LIKE %s", $like );
+                        $searches[] = $this->dbh->prepare( "$column LIKE %s", $like );
                 }
 
                 return '(' . implode( ' OR ', $searches ) . ')';
@@ -628 +620 @@
          * @since 4.6.0
          * @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;
-
                 $parsed = false;
 
                 switch ( $orderby ) {
                         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->dbh->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->dbh->blogs}.site_id, $network__in )";
                                 break;
                         case 'domain':
                         case 'last_updated':

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

@@ -157 +157 @@
          * @since 4.5.0
          * @access public
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param int $site_id The ID of the site to retrieve.
          * @return WP_Site|false The site's object if found. False if not.
          */
         public static function get_instance( $site_id ) {
-                global $wpdb;
-
                 $site_id = (int) $site_id;
                 if ( ! $site_id ) {
                         return false;
@@ -173 +169 @@
                 $_site = wp_cache_get( $site_id, 'sites' );
 
                 if ( ! $_site ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = %d LIMIT 1", $site_id ) );
 
                         if ( empty( $_site ) || is_wp_error( $_site ) ) {

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

@@ -91 +91 @@
          */
         public $primary_id_column;
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -125 +127 @@
                         $this->relation = 'AND';
                 }
 
+                $this->dbh = WP::get( 'wpdb' );
+
                 $this->queries = $this->sanitize_query( $tax_query );
         }
 
@@ -387 +391 @@
          * @since 4.1.0
          * @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.
          * @return array {
@@ -399 +401 @@
          * }
          */
         public function get_sql_for_clause( &$clause, $parent_query ) {
-                global $wpdb;
-
                 $sql = array(
                         'where' => array(),
                         'join'  => array(),
@@ -432 +432 @@
                         $alias = $this->find_compatible_table_alias( $clause, $parent_query );
                         if ( false === $alias ) {
                                 $i = count( $this->table_aliases );
-                                $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+                                $alias = $i ? 'tt' . $i : $this->dbh->term_relationships;
 
                                 // Store the alias as part of a flat array to build future iterators.
                                 $this->table_aliases[] = $alias;
@@ -440 +440 @@
                                 // Store the alias with this clause, so later siblings can use it.
                                 $clause['alias'] = $alias;
 
-                                $join .= " LEFT JOIN $wpdb->term_relationships";
+                                $join .= " LEFT JOIN {$this->dbh->term_relationships}";
                                 $join .= $i ? " AS $alias" : '';
                                 $join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";
                         }
@@ -458 +458 @@
 
                         $where = "$this->primary_table.$this->primary_id_column NOT IN (
                                 SELECT object_id
-                                FROM $wpdb->term_relationships
+                                FROM {$this->dbh->term_relationships}
                                 WHERE term_taxonomy_id IN ($terms)
                         )";
 
@@ -474 +474 @@
 
                         $where = "(
                                 SELECT COUNT(1)
-                                FROM $wpdb->term_relationships
+                                FROM {$this->dbh->term_relationships}
                                 WHERE term_taxonomy_id IN ($terms)
                                 AND object_id = $this->primary_table.$this->primary_id_column
                         ) = $num_terms";
@@ -481 +481 @@
 
                 } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
 
-                        $where = $wpdb->prepare( "$operator (
+                        $where = $this->dbh->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->dbh->term_relationships}
+                                INNER JOIN {$this->dbh->term_taxonomy}
+                                ON {$this->dbh->term_taxonomy}.term_taxonomy_id = {$this->dbh->term_relationships}.term_taxonomy_id
+                                WHERE {$this->dbh->term_taxonomy}.taxonomy = %s
+                                AND {$this->dbh->term_relationships}.object_id = {$this->primary_table}.{$this->primary_id_column}
                         )", $clause['taxonomy'] );
 
                 }
@@ -597 +597 @@
          *
          * @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',
          *                                or 'term_id'. Default 'term_id'.
          */
         public function transform_query( &$query, $resulting_field ) {
-                global $wpdb;
-
                 if ( empty( $query['terms'] ) )
                         return;
 
@@ -628 +624 @@
 
                                 $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->dbh->get_col( "
+                                        SELECT {$this->dbh->term_taxonomy}.$resulting_field
+                                        FROM {$this->dbh->term_taxonomy}
+                                        INNER JOIN {$this->dbh->terms} USING (term_id)
                                         WHERE taxonomy = '{$query['taxonomy']}'
-                                        AND $wpdb->terms.{$query['field']} IN ($terms)
+                                        AND {$this->dbh->terms}.{$query['field']} IN ($terms)
                                 " );
                                 break;
                         case 'term_taxonomy_id':
                                 $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-                                $terms = $wpdb->get_col( "
+                                $terms = $this->dbh->get_col( "
                                         SELECT $resulting_field
-                                        FROM $wpdb->term_taxonomy
+                                        FROM {$this->dbh->term_taxonomy}
                                         WHERE term_taxonomy_id IN ($terms)
                                 " );
                                 break;
                         default:
                                 $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-                                $terms = $wpdb->get_col( "
+                                $terms = $this->dbh->get_col( "
                                         SELECT $resulting_field
-                                        FROM $wpdb->term_taxonomy
+                                        FROM {$this->dbh->term_taxonomy}
                                         WHERE taxonomy = '{$query['taxonomy']}'
                                         AND term_id IN ($terms)
                                 " );

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

@@ -86 +86 @@
          */
         public $terms;
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -201 +203 @@
                         'meta_query'             => '',
                 );
 
+                $this->dbh = WP::get( 'wpdb' );
+
                 if ( ! empty( $query ) ) {
                         $this->query( $query );
                 }
@@ -293 +297 @@
          * @param 4.6.0
          * @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;
 
@@ -486 +486 @@
                                 $tt_ids = implode( ',', array_map( 'intval', $args['term_taxonomy_id'] ) );
                                 $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->dbh->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->dbh->prepare( "t.name LIKE %s", '%' . $this->dbh->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->dbh->prepare( "tt.description LIKE %s", '%' . $this->dbh->esc_like( $args['description__like'] ) . '%' );
                 }
 
                 if ( '' !== $parent ) {
@@ -591 +591 @@
                  */
                 $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->dbh->term_taxonomy} AS tt ON t.term_id = tt.term_id";
 
                 $where = implode( ' AND ', $this->sql_clauses['where'] );
 
@@ -621 +621 @@
                 }
 
                 $this->sql_clauses['select']  = "SELECT $distinct $fields";
-                $this->sql_clauses['from']    = "FROM $wpdb->terms AS t $join";
+                $this->sql_clauses['from']    = "FROM {$this->dbh->terms} AS t $join";
                 $this->sql_clauses['orderby'] = $orderby ? "$orderby $order" : '';
                 $this->sql_clauses['limits']  = $limits;
 
@@ -646 +646 @@
                 }
 
                 if ( 'count' == $_fields ) {
-                        return $wpdb->get_var( $this->request );
+                        return $this->dbh->get_var( $this->request );
                 }
 
-                $terms = $wpdb->get_results( $this->request );
+                $terms = $this->dbh->get_results( $this->request );
                 if ( 'all' == $_fields ) {
                         update_term_cache( $terms );
                 }
@@ -753 +753 @@
          * @since 4.6.0
          * @access protected
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $orderby_raw Alias for the field to order by.
          * @return string|false Value to used in the ORDER clause. False otherwise.
          */
@@ -894 +892 @@
          * @since 4.6.0
          * @access protected
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $string
          * @return string
          */
         protected function get_search_sql( $string ) {
-                global $wpdb;
+                $like = '%' . $this->dbh->esc_like( $string ) . '%';
 
-                $like = '%' . $wpdb->esc_like( $string ) . '%';
-
-                return $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
+                return $this->dbh->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
         }
 }

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

@@ -113 +113 @@
          * @access public
          * @static
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param int    $term_id  Term ID.
          * @param string $taxonomy Optional. Limit matched terms to those matching `$taxonomy`. Only used for
          *                         disambiguating potentially shared terms.
@@ -123 +121 @@
          *                                False for other failures.
          */
         public static function get_instance( $term_id, $taxonomy = null ) {
-                global $wpdb;
-
                 $term_id = (int) $term_id;
                 if ( ! $term_id ) {
                         return false;
@@ -134 +130 @@
 
                 // If there isn't a cached version, hit the database.
                 if ( ! $_term || ( $taxonomy && $taxonomy !== $_term->taxonomy ) ) {
+                        $wpdb = WP::get( 'wpdb' );
                         // Grab all matching terms, in case any are shared between taxonomies.
                         $terms = $wpdb->get_results( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id = %d", $term_id ) );
                         if ( ! $terms ) {

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

@@ -70 +70 @@
         public $query_orderby;
         public $query_limit;
 
+        protected $dbh;
+
         /**
          * PHP5 constructor.
          *
@@ -78 +80 @@
          * @param null|string|array $query Optional. The query variables.
          */
         public function __construct( $query = null ) {
+                $this->dbh = WP::get( 'wpdb' );
+
                 if ( ! empty( $query ) ) {
                         $this->prepare_query( $query );
                         $this->query();
@@ -134 +138 @@
          *
          * @access public
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
          * @global int  $blog_id
          *
          * @param string|array $query {
@@ -198 +201 @@
          * }
          */
         public function prepare_query( $query = array() ) {
-                global $wpdb;
-
                 if ( empty( $this->query_vars ) || ! empty( $query ) ) {
                         $this->query_limit = null;
                         $this->query_vars = $this->fill_query_vars( $query );
@@ -228 +229 @@
                         $this->query_fields = array();
                         foreach ( $qv['fields'] as $field ) {
                                 $field = 'ID' === $field ? 'ID' : sanitize_key( $field );
-                                $this->query_fields[] = "$wpdb->users.$field";
+                                $this->query_fields[] = "{$this->dbh->users}.$field";
                         }
                         $this->query_fields = implode( ',', $this->query_fields );
                 } elseif ( 'all' == $qv['fields'] ) {
-                        $this->query_fields = "$wpdb->users.*";
+                        $this->query_fields = "{$this->dbh->users}.*";
                 } else {
-                        $this->query_fields = "$wpdb->users.ID";
+                        $this->query_fields = "{$this->dbh->users}.ID";
                 }
 
                 if ( isset( $qv['count_total'] ) && $qv['count_total'] )
                         $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 
-                $this->query_from = "FROM $wpdb->users";
+                $this->query_from = "FROM {$this->dbh->users}";
                 $this->query_where = "WHERE 1=1";
 
                 // Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
@@ -263 +264 @@
                         }
 
                         foreach ( $post_types as &$post_type ) {
-                                $post_type = $wpdb->prepare( '%s', $post_type );
+                                $post_type = $this->dbh->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 ) . " ) )";
+                        $posts_table = $this->dbh->get_blog_prefix( $blog_id ) . 'posts';
+                        $this->query_where .= " AND {$this->dbh->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 ) . " ) )";
                 }
 
                 // Meta query.
@@ -276 +277 @@
 
                 if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
                         $who_query = array(
-                                'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
+                                'key' => $this->dbh->get_blog_prefix( $blog_id ) . 'user_level',
                                 'value' => 0,
                                 'compare' => '!=',
                         );
@@ -323 +324 @@
                         if ( ! empty( $roles ) ) {
                                 foreach ( $roles as $role ) {
                                         $roles_clauses[] = array(
-                                                'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                                                'key'     => $this->dbh->get_blog_prefix( $blog_id ) . 'capabilities',
                                                 'value'   => '"' . $role . '"',
                                                 'compare' => 'LIKE',
                                         );
@@ -336 +337 @@
                         if ( ! empty( $role__in ) ) {
                                 foreach ( $role__in as $role ) {
                                         $role__in_clauses[] = array(
-                                                'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                                                'key'     => $this->dbh->get_blog_prefix( $blog_id ) . 'capabilities',
                                                 'value'   => '"' . $role . '"',
                                                 'compare' => 'LIKE',
                                         );
@@ -349 +350 @@
                         if ( ! empty( $role__not_in ) ) {
                                 foreach ( $role__not_in as $role ) {
                                         $role__not_in_clauses[] = array(
-                                                'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                                                'key'     => $this->dbh->get_blog_prefix( $blog_id ) . 'capabilities',
                                                 'value'   => '"' . $role . '"',
                                                 'compare' => 'NOT LIKE',
                                         );
@@ -361 +362 @@
                         // If there are no specific roles named, make sure the user is a member of the site.
                         if ( empty( $role_queries ) ) {
                                 $role_queries[] = array(
-                                        'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+                                        'key' => $this->dbh->get_blog_prefix( $blog_id ) . 'capabilities',
                                         'compare' => 'EXISTS',
                                 );
                         }
@@ -383 +384 @@
                 }
 
                 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->dbh->users, 'ID', $this );
                         $this->query_from .= $clauses['join'];
                         $this->query_where .= $clauses['where'];
 
@@ -441 +442 @@
                 // limit
                 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->dbh->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->dbh->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
                         }
                 }
 
@@ -499 +500 @@
                 if ( ! empty( $include ) ) {
                         // Sanitized earlier.
                         $ids = implode( ',', $include );
-                        $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
+                        $this->query_where .= " AND {$this->dbh->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->dbh->users}.ID NOT IN ($ids)";
                 }
 
                 // Date queries are allowed for the user_registered field.
@@ -530 +531 @@
          * Execute the query, with the current variables.
          *
          * @since 3.1.0
-         *
-         * @global wpdb $wpdb WordPress database abstraction object.
          */
         public function query() {
-                global $wpdb;
-
                 $qv =& $this->query_vars;
 
                 $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
                 if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
-                        $this->results = $wpdb->get_results( $this->request );
+                        $this->results = $this->dbh->get_results( $this->request );
                 } else {
-                        $this->results = $wpdb->get_col( $this->request );
+                        $this->results = $this->dbh->get_col( $this->request );
                 }
 
                 /**
@@ -551 +548 @@
                  *
                  * @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()' ) );
+                        $this->total_users = $this->dbh->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
 
                 if ( !$this->results )
                         return;
@@ -611 +606 @@
          * @access protected
          * @since 3.1.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $string
          * @param array  $cols
          * @param bool   $wild   Whether to allow wildcard searches. Default is false for Network Admin, true for single site.
@@ -620 +613 @@
          * @return string
          */
         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->dbh->esc_like( $string ) . $trailing_wild;
 
                 foreach ( $cols as $col ) {
                         if ( 'ID' == $col ) {
-                                $searches[] = $wpdb->prepare( "$col = %s", $string );
+                                $searches[] = $this->dbh->prepare( "$col = %s", $string );
                         } else {
-                                $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+                                $searches[] = $this->dbh->prepare( "$col LIKE %s", $like );
                         }
                 }
 
@@ -668 +659 @@
          * @since 4.2.0
          * @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();
 
                 $_orderby = '';
@@ -690 +677 @@
                         $where = get_posts_by_author_sql( 'post' );
                         $this->query_from .= " LEFT OUTER JOIN (
                                 SELECT post_author, COUNT(*) as post_count
-                                FROM $wpdb->posts
+                                FROM {$this->dbh->posts}
                                 $where
                                 GROUP BY post_author
-                        ) p ON ({$wpdb->users}.ID = p.post_author)
+                        ) p ON ({$this->dbh->users}.ID = p.post_author)
                         ";
                         $_orderby = 'post_count';
                 } elseif ( 'ID' == $orderby || 'id' == $orderby ) {
                         $_orderby = 'ID';
                 } elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
-                        $_orderby = "$wpdb->usermeta.meta_value";
+                        $_orderby = "{$this->dbh->usermeta}.meta_value";
                 } elseif ( 'meta_value_num' == $orderby ) {
-                        $_orderby = "$wpdb->usermeta.meta_value+0";
+                        $_orderby = "{$this->dbh->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->dbh->users}.ID, $include_sql )";
                 } elseif ( isset( $meta_query_clauses[ $orderby ] ) ) {
                         $meta_clause = $meta_query_clauses[ $orderby ];
                         $_orderby = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );

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

@@ -101 +101 @@
          */
         private static $back_compat_keys;
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -109 +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.
          * @param string $name Optional. User's username
          * @param int $blog_id Optional Site ID, defaults to current site.
          */
         public function __construct( $id = 0, $name = '', $blog_id = '' ) {
+                $this->dbh = WP::get( 'wpdb' );
+
                 if ( ! isset( self::$back_compat_keys ) ) {
-                        $prefix = $GLOBALS['wpdb']->prefix;
+                        $prefix = $this->dbh->prefix;
                         self::$back_compat_keys = array(
                                 'user_firstname' => 'first_name',
                                 'user_lastname' => 'last_name',
@@ -175 +177 @@
          *
          * @static
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param string $field The field to query against: 'id', 'ID', 'slug', 'email' or 'login'.
          * @param string|int $value The field value
          * @return object|false Raw user object
          */
         public static function get_data_by( $field, $value ) {
-                global $wpdb;
-
                 // 'ID' is an alias of 'id'.
                 if ( 'ID' === $field ) {
                         $field = 'id';
@@ -231 +229 @@
                                 return $user;
                 }
 
+                $wpdb = WP::get( 'wpdb' );
                 if ( !$user = $wpdb->get_row( $wpdb->prepare(
                         "SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
                 ) ) )
@@ -442 +441 @@
          * @access protected
          * @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';
+                        $this->cap_key = $this->dbh->get_blog_prefix() . 'capabilities';
                 else
                         $this->cap_key = $cap_key;
 
@@ -631 +626 @@
          *
          * @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->dbh->get_blog_prefix() . 'user_level', $this->user_level );
         }
 
         /**
@@ -679 +671 @@
          *
          * @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->dbh->get_blog_prefix() . 'user_level' );
                 $this->get_role_caps();
         }
 
@@ -772 +761 @@
          *
          * @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';
+                        $cap_key = $this->dbh->get_blog_prefix( $blog_id ) . 'capabilities';
                 else
                         $cap_key = '';
                 $this->_init_caps( $cap_key );

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

@@ -53 +53 @@
          */
         protected $auth_failed = false;
 
+        protected $dbh;
+
         /**
          * Registers all of the XMLRPC methods that XMLRPC server understands.
          *
@@ -63 +65 @@
          * @since 1.5.0
          */
         public function __construct() {
+                $this->dbh = WP::get( 'wpdb' );
+
                 $this->methods = array(
                         // WordPress API
                         'wp.getUsersBlogs'              => 'this:wp_getUsersBlogs',
@@ -2882 +2886 @@
          *
          * @since 2.2.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param array  $args {
          *     Method arguments. Note: arguments must be ordered as documented.
          *
@@ -2894 +2896 @@
          * @return array|IXR_Error
          */
         public function wp_getPageList( $args ) {
-                global $wpdb;
-
                 $this->escape( $args );
 
                 $username = $args[1];
@@ -2911 +2911 @@
                 do_action( 'xmlrpc_call', 'wp.getPageList' );
 
                 // Get list of pages ids and titles
-                $page_list = $wpdb->get_results("
+                $page_list = $this->dbh->get_results("
                         SELECT ID page_id,
                                 post_title page_title,
                                 post_parent page_parent_id,
@@ -2918 +2918 @@
                                 post_date_gmt,
                                 post_date,
                                 post_status
-                        FROM {$wpdb->posts}
+                        FROM {$this->dbh->posts}
                         WHERE post_type = 'page'
                         ORDER BY ID
                 ");
@@ -5130 +5130 @@
          *
          * @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->dbh->get_results( "SELECT ID, guid FROM {$this->dbh->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->dbh->update($this->dbh->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+                                }
                         }
                 }
         }
@@ -5763 +5760 @@
          *
          * @since 1.5.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
-         *
          * @param array  $args {
          *     Method arguments. Note: arguments must be ordered as documented.
          *
@@ -5776 +5771 @@
          * @return array|IXR_Error
          */
         public function mw_newMediaObject( $args ) {
-                global $wpdb;
-
                 $username = $this->escape( $args[1] );
                 $password = $this->escape( $args[2] );
                 $data     = $args[3];
@@ -6102 +6095 @@
          *
          * @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' );
 
@@ -6118 +6107 @@
                 if ( !$actual_post )
                         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->dbh->get_results( $this->dbh->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM {$this->dbh->comments} WHERE comment_post_ID = %d", $post_ID) );
 
                 if ( !$comments )
                         return array();
@@ -6192 +6181 @@
          *
          * @since 1.5.0
          *
-         * @global wpdb $wpdb WordPress database abstraction object.
          * @global string $wp_version
          *
          * @param array  $args {
@@ -6204 +6192 @@
          * @return string|IXR_Error
          */
         public function pingback_ping( $args ) {
-                global $wpdb, $wp_version;
+                global $wp_version;
 
                 /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
                 do_action( 'xmlrpc_call', 'pingback.ping' );
@@ -6258 +6246 @@
                         } elseif ( is_string($urltest['fragment']) ) {
                                 // ...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->dbh->prepare("SELECT ID FROM {$this->dbh->posts} WHERE post_title RLIKE %s", $title );
+                                if (! ($post_ID = $this->dbh->get_var($sql)) ) {
                                         // returning unknown error '0' is better than die()ing
                                         return $this->pingback_error( 0, '' );
                                 }
@@ -6283 +6271 @@
                         return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
 
                 // 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->dbh->get_results( $this->dbh->prepare("SELECT * FROM {$this->dbh->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.' ) );
 
                 // very stupid, but gives time to the 'from' server to publish !
@@ -6408 +6396 @@
          *
          * @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' );
 
@@ -6434 +6418 @@
                         return $this->pingback_error( 32, __('The specified target URL does not exist.' ) );
                 }
 
-                $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->dbh->get_results( $this->dbh->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM {$this->dbh->comments} WHERE comment_post_ID = %d", $post_ID) );
 
                 if ( !$comments )
                         return array();

src/wp-includes/class-wp.php

@@ -91 +91 @@
          */
         public $did_permalink = false;
 
+        public static function get( $key, $global = false ) {
+                return WP_Registry::instance()->get( $key, $global );
+        }
+
+        public static function set( $key, $value = null, $global = false ) {
+                return WP_Registry::instance()->set( $key, $value, $global );
+        }
+
         /**
          * Add name to list of public query variables.
          *

src/wp-includes/comment-template.php

@@ -1275 +1275 @@
  *
  * @global WP_Query   $wp_query
  * @global WP_Post    $post
- * @global wpdb       $wpdb
  * @global int        $id
  * @global WP_Comment $comment
  * @global string     $user_login
@@ -1289 +1288 @@
  *                                  Default false.
  */
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
-        global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
+        global $wp_query, $withcomments, $post, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
+        $wpdb = WP::get( 'wpdb' );
+
         if ( !(is_single() || is_page() || $withcomments) || empty($post) )
                 return;
 

src/wp-includes/comment.php

@@ -24 +24 @@
  *
  * @since 1.2.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $author       Comment author name.
  * @param string $email        Comment author email.
  * @param string $url          Comment author URL.
@@ -37 +35 @@
  * @return bool If all checks pass, true, otherwise false.
  */
 function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) {
-        global $wpdb;
-
         // If manual moderation is enabled, skip all checks and return false.
         if ( 1 == get_option('comment_moderation') )
                 return false;
@@ -110 +106 @@
          */
         if ( 1 == get_option('comment_whitelist')) {
                 if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
+                        $wpdb = WP::get( 'wpdb' );
                         // expected_slashed ($author, $email)
                         $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
                         if ( ( 1 == $ok_to_comment ) &&
@@ -287 +284 @@
  *
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
  * @staticvar array $cache_lastcommentmodified
  *
  * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
@@ -295 +291 @@
  * @return string Last comment modified date.
  */
 function get_lastcommentmodified($timezone = 'server') {
-        global $wpdb;
         static $cache_lastcommentmodified = array();
 
         if ( isset($cache_lastcommentmodified[$timezone]) )
@@ -303 +298 @@
 
         $add_seconds_server = date('Z');
 
+        $wpdb = WP::get( 'wpdb' );
         switch ( strtolower($timezone)) {
                 case 'gmt':
                         $lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
@@ -328 +324 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
  * @return array The amount of spam, approved, awaiting moderation, and total comments.
  */
 function get_comment_count( $post_id = 0 ) {
-        global $wpdb;
-
+        $wpdb = WP::get( 'wpdb' );
         $post_id = (int) $post_id;
 
         $where = '';
@@ -582 +575 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param array $commentdata Contains information on the comment
  * @return int|string Signifies the approval status (0|1|'spam')
  */
 function wp_allow_comment( $commentdata ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         // Simple duplicate check
         // expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
@@ -715 +706 @@
  *
  * @since 2.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $ip Comment IP.
  * @param string $email Comment author email address.
  * @param string $date MySQL time string.
  */
 function check_comment_flood_db( $ip, $email, $date ) {
-        global $wpdb;
         // don't throttle admins or moderators
         if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {
                 return;
@@ -737 +725 @@
                 $check_column = '`comment_author_IP`';
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $sql = $wpdb->prepare(
                 "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( $check_column = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1",
                 $hour_ago,
@@ -854 +843 @@
  *
  * @since 2.7.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int   $comment_ID Comment ID.
  * @param array $args {
  *      Array of optional arguments.
@@ -870 +857 @@
  * @return int|null Comment page number or null on error.
  */
 function get_page_of_comment( $comment_ID, $args = array() ) {
-        global $wpdb;
-
         $page = null;
 
         if ( !$comment = get_comment( $comment_ID ) )
@@ -913 +898 @@
                 if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
                         return get_page_of_comment( $comment->comment_parent, $args );
 
+                $wpdb = WP::get( 'wpdb' );
                 $comment_args = array(
                         'type'       => $args['type'],
                         'post_id'    => $comment->comment_post_ID,
@@ -974 +960 @@
  *
  * @since 4.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return array Maximum character length for the comment form fields.
  */
 function wp_get_comment_fields_max_lengths() {
-        global $wpdb;
-
+        $wpdb = WP::get( 'wpdb' );
         $lengths = array(
                 'comment_author'       => 245,
                 'comment_author_email' => 100,
@@ -1144 +1127 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|WP_Comment $comment_id   Comment ID or WP_Comment object.
  * @param bool           $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return bool True on success, false on failure.
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
-        global $wpdb;
         if (!$comment = get_comment($comment_id))
                 return false;
 
@@ -1167 +1147 @@
          */
         do_action( 'delete_comment', $comment->comment_ID );
 
+        $wpdb = WP::get( 'wpdb' );
         // Move children up a level.
         $children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID) );
         if ( !empty($children) ) {
@@ -1532 +1513 @@
  * @since 2.0.0
  * @since 4.4.0 Introduced `$comment_meta` argument.
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param array $commentdata {
  *     Array of arguments for inserting a new comment.
  *
@@ -1562 +1541 @@
  * @return int|false The new comment's ID on success, false on failure.
  */
 function wp_insert_comment( $commentdata ) {
-        global $wpdb;
         $data = wp_unslash( $commentdata );
 
         $comment_author       = ! isset( $data['comment_author'] )       ? '' : $data['comment_author'];
@@ -1584 +1562 @@
         $user_id  = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
 
         $compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
+        $wpdb = WP::get( 'wpdb' );
         if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
                 return false;
         }
@@ -1717 +1696 @@
  * @since 4.3.0 'comment_agent' and 'comment_author_IP' can be set via `$commentdata`.
  *
  * @see wp_insert_comment()
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $commentdata {
  *     Comment data.
@@ -1741 +1719 @@
  * @return int|false The ID of the comment on success, false on failure.
  */
 function wp_new_comment( $commentdata ) {
-        global $wpdb;
-
         if ( isset( $commentdata['user_ID'] ) ) {
                 $commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
         }
@@ -1797 +1773 @@
 
                 foreach ( $fields as $field ) {
                         if ( isset( $commentdata[ $field ] ) ) {
+                                $wpdb = WP::get( 'wpdb' );
                                 $commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
                         }
                 }
@@ -1901 +1878 @@
  *
  * @since 1.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|WP_Comment $comment_id     Comment ID or WP_Comment object.
  * @param string         $comment_status New comment status, either 'hold', 'approve', 'spam', or 'trash'.
  * @param bool           $wp_error       Whether to return a WP_Error object if there is a failure. Default is false.
@@ -1909 +1884 @@
  * @return bool|WP_Error True on success, false or WP_Error on failure.
  */
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
-        global $wpdb;
-
         switch ( $comment_status ) {
                 case 'hold':
                 case '0':
@@ -1933 +1906 @@
 
         $comment_old = clone get_comment($comment_id);
 
+        $wpdb = WP::get( 'wpdb' );
         if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-                if ( $wp_error )
+                if ( $wp_error ) {
                         return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
-                else
+                } else {
                         return false;
+                }
         }
 
         clean_comment_cache( $comment_old->comment_ID );
@@ -1970 +1945 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param array $commentarr Contains information on the comment.
  * @return int Comment was updated if value is 1, or was not updated if value is 0.
  */
 function wp_update_comment($commentarr) {
-        global $wpdb;
-
         // First, get all of the original fields
         $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
         if ( empty( $comment ) ) {
@@ -2025 +1996 @@
         $comment_post_ID = $data['comment_post_ID'];
         $keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP' );
         $data = wp_array_slice_assoc( $data, $keys );
+        $wpdb = WP::get( 'wpdb' );
         $rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
 
         clean_comment_cache( $comment_ID );
@@ -2125 +2097 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $post_id Post ID
  * @return bool True on success, false on '0' $post_id or if post with ID does not exist.
  */
 function wp_update_comment_count_now($post_id) {
-        global $wpdb;
         $post_id = (int) $post_id;
         if ( !$post_id )
                 return false;
@@ -2155 +2124 @@
          */
         $new = apply_filters( 'pre_wp_update_comment_count_now', null, $old, $post_id );
 
+        $wpdb = WP::get( 'wpdb' );
         if ( is_null( $new ) ) {
                 $new = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id ) );
         } else {
@@ -2260 +2230 @@
  * Perform all pingbacks, enclosures, trackbacks, and send to pingback services.
  *
  * @since 2.1.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function do_all_pings() {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         // Do pingbacks
         while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
@@ -2293 +2261 @@
  *
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $post_id Post ID to do trackbacks on.
  */
 function do_trackbacks($post_id) {
-        global $wpdb;
-
         $post = get_post( $post_id );
         $to_ping = get_to_ping($post_id);
         $pinged  = get_pung($post_id);
         if ( empty($to_ping) ) {
+                $wpdb = WP::get( 'wpdb' );
                 $wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );
                 return;
         }
@@ -2330 +2295 @@
                                 trackback($tb_ping, $post_title, $excerpt, $post_id);
                                 $pinged[] = $tb_ping;
                         } else {
+                                $wpdb = WP::get( 'wpdb' );
                                 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
                         }
                 }
@@ -2469 +2435 @@
  *
  * @since 0.71
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $trackback_url URL to send trackbacks.
  * @param string $title Title of post.
  * @param string $excerpt Excerpt of post.
@@ -2478 +2442 @@
  * @return int|false|void Database query from update.
  */
 function trackback($trackback_url, $title, $excerpt, $ID) {
-        global $wpdb;
-
         if ( empty($trackback_url) )
                 return;
 
@@ -2497 +2459 @@
         if ( is_wp_error( $response ) )
                 return;
 
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
         return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
 }
@@ -2621 +2584 @@
  * @access private
  *
  * @see update_comment_cache()
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $comment_ids       Array of comment IDs.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
 function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
-        global $wpdb;
-
         $non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
         if ( !empty( $non_cached_ids ) ) {
+                $wpdb = WP::get( 'wpdb' );
                 $fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
 
                 update_comment_cache( $fresh_comments, $update_meta_cache );

src/wp-includes/date.php

@@ -62 +62 @@
          */
         public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
 
+        protected $dbh;
+
         /**
          * Constructor.
          *
@@ -158 +160 @@
                         $this->relation = 'AND';
                 }
 
+                $this->dbh = WP::get( 'wpdb' );
+
                 if ( ! is_array( $date_query ) ) {
                         return;
                 }
@@ -486 +490 @@
          * @return string A validated column name value.
          */
         public function validate_column( $column ) {
-                global $wpdb;
-
                 $valid_columns = array(
                         'post_date', 'post_date_gmt', 'post_modified',
                         'post_modified_gmt', 'comment_date', 'comment_date_gmt',
@@ -512 +514 @@
                         }
 
                         $known_columns = array(
-                                $wpdb->posts => array(
+                                $this->dbh->posts => array(
                                         'post_date',
                                         'post_date_gmt',
                                         'post_modified',
                                         'post_modified_gmt',
                                 ),
-                                $wpdb->comments => array(
+                                $this->dbh->comments => array(
                                         'comment_date',
                                         'comment_date_gmt',
                                 ),
-                                $wpdb->users => array(
+                                $this->dbh->users => array(
                                         'user_registered',
                                 ),
-                                $wpdb->blogs => array(
+                                $this->dbh->blogs => array(
                                         'registered',
                                         'last_updated',
                                 ),
@@ -717 +719 @@
          * }
          */
         protected function get_sql_for_clause( $query, $parent_query ) {
-                global $wpdb;
-
                 // The sub-parts of a $where part.
                 $where_parts = array();
 
@@ -741 +741 @@
 
                 // Range queries.
                 if ( ! empty( $query['after'] ) )
-                        $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+                        $where_parts[] = $this->dbh->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
 
                 if ( ! empty( $query['before'] ) )
-                        $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+                        $where_parts[] = $this->dbh->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
 
                 // Specific value queries.
 
@@ -958 +958 @@
          * @return string|false A query part or false on failure.
          */
         public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
-                global $wpdb;
-
                 // Have to have at least one
                 if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
                         return false;
@@ -1013 +1011 @@
                         $time   .= sprintf( '%02d', $second );
                 }
 
-                return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+                return $this->dbh->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
         }
 }

src/wp-includes/deprecated.php

@@ -2210 +2210 @@
  */
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
         _deprecated_function( __FUNCTION__, '3.0.0', 'delete_user_meta()' );
-        global $wpdb;
+
         if ( !is_numeric( $user_id ) )
                 return false;
         $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
@@ -2219 +2219 @@
                 $meta_value = serialize($meta_value);
         $meta_value = trim( $meta_value );
 
+        $wpdb = WP::get( 'wpdb' );
         $cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
         if ( $cur && $cur->umeta_id )
@@ -2256 +2257 @@
  */
 function get_usermeta( $user_id, $meta_key = '' ) {
         _deprecated_function( __FUNCTION__, '3.0.0', 'get_user_meta()' );
-        global $wpdb;
+
         $user_id = (int) $user_id;
 
         if ( !$user_id )
                 return false;
 
+        $wpdb = WP::get( 'wpdb' );
+
         if ( !empty($meta_key) ) {
                 $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
                 $user = wp_cache_get($user_id, 'users');
@@ -2309 +2312 @@
  */
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
         _deprecated_function( __FUNCTION__, '3.0.0', 'update_user_meta()' );
-        global $wpdb;
+
         if ( !is_numeric( $user_id ) )
                 return false;
         $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
@@ -2323 +2326 @@
                 return delete_usermeta($user_id, $meta_key);
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
         if ( $cur )
@@ -2356 +2360 @@
  * @deprecated 3.1.0 Use get_users()
  * @see get_users()
  *
- * @global wpdb $wpdb    WordPress database abstraction object.
  * @global int  $blog_id The site ID of the site for those that use more than one site.
  *
  * @param int $id Site ID.
@@ -2365 +2368 @@
 function get_users_of_blog( $id = '' ) {
         _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
-        global $wpdb, $blog_id;
-        if ( empty($id) )
+        global $blog_id;
+        if ( empty( $id ) ) {
                 $id = (int) $blog_id;
+        }
+        $wpdb = WP::get( 'wpdb' );
         $blog_prefix = $wpdb->get_blog_prefix($id);
         $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
         return $users;

src/wp-includes/formatting.php

@@ -3717 +3717 @@
  *
  * @since 2.8.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string|array $data Unescaped data
  * @return string|array Escaped data
  */
 function esc_sql( $data ) {
-        global $wpdb;
-        return $wpdb->_escape( $data );
+        return WP::get( 'wpdb' )->_escape( $data );
 }
 
 /**
@@ -4012 +4009 @@
  *
  * @since 2.0.5
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $option The name of the option.
  * @param string $value  The unsanitised value.
  * @return string Sanitized value.
  */
 function sanitize_option( $option, $value ) {
-        global $wpdb;
-
         $original_value = $value;
         $error = '';
 
+        $wpdb = WP::get( 'wpdb' );
+
         switch ( $option ) {
                 case 'admin_email' :
                 case 'new_admin_email' :

src/wp-includes/functions.php

@@ -554 +554 @@
  *
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $content Post Content.
  * @param int    $post_ID Post ID.
  */
 function do_enclose( $content, $post_ID ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         //TODO: Tidy this ghetto code up and make the debug code optional
         include_once( ABSPATH . WPINC . '/class-IXR.php' );
@@ -1183 +1181 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return int Number of database queries.
  */
 function get_num_queries() {
-        global $wpdb;
-        return $wpdb->num_queries;
+        return WP::get( 'wpdb' )->num_queries;
 }
 
 /**
@@ -1353 +1348 @@
  *
  * @since 2.1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return bool Whether the site is already installed.
  */
 function is_blog_installed() {
-        global $wpdb;
-
         /*
          * Check cache first. If options table goes away and we have true
          * cached, oh well.
@@ -1367 +1358 @@
         if ( wp_cache_get( 'is_blog_installed' ) )
                 return true;
 
+        $wpdb = WP::get( 'wpdb' );
         $suppress = $wpdb->suppress_errors();
         if ( ! wp_installing() ) {
                 $alloptions = wp_load_alloptions();
@@ -3612 +3604 @@
  * in WordPress 2.5.0.
  *
  * @since 2.3.2
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function dead_db() {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         wp_load_translations_early();
 
@@ -4285 +4275 @@
  *
  * @since 4.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return int The ID of the main network.
  */
 function get_main_network_id() {
-        global $wpdb;
-
         if ( ! is_multisite() ) {
                 return 1;
         }
@@ -4307 +4293 @@
                 $main_network_id = wp_cache_get( 'primary_network_id', 'site-options' );
 
                 if ( false === $main_network_id ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $main_network_id = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1" );
                         wp_cache_add( 'primary_network_id', $main_network_id, 'site-options' );
                 }
@@ -4580 +4567 @@
  * The default value of `EMPTY_TRASH_DAYS` is 30 (days).
  *
  * @since 2.9.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wp_scheduled_delete() {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
 

src/wp-includes/general-template.php

@@ -1611 +1611 @@
  *
  * @see get_archives_link()
  *
- * @global wpdb      $wpdb
  * @global WP_Locale $wp_locale
  *
  * @param string|array $args {
@@ -1639 +1638 @@
  * @return string|void String when retrieving.
  */
 function wp_get_archives( $args = '' ) {
-        global $wpdb, $wp_locale;
+        global $wp_locale;
 
         $defaults = array(
                 'type' => 'monthly', 'limit' => '',
@@ -1674 +1673 @@
         // this is what will separate dates on weekly archive links
         $archive_week_separator = '–';
 
+        $wpdb = WP::get( 'wpdb' );
         $sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $r['post_type'] );
 
         /**
@@ -1857 +1857 @@
  *
  * @since 1.0.0
  *
- * @global wpdb      $wpdb
  * @global int       $m
  * @global int       $monthnum
  * @global int       $year
@@ -1869 +1868 @@
  * @return string|void String when retrieving.
  */
 function get_calendar( $initial = true, $echo = true ) {
-        global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
+        global $m, $monthnum, $year, $wp_locale, $posts;
 
+        $wpdb = WP::get( 'wpdb' );
+
         $key = md5( $m . $monthnum . $year );
         $cache = wp_cache_get( 'get_calendar', 'calendar' );
 

src/wp-includes/http.php

@@ -602 +602 @@
  *
  * @since 3.6.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
  * @staticvar array $queried
  *
  * @param bool   $is_external
@@ -610 +609 @@
  * @return bool
  */
 function ms_allowed_http_request_hosts( $is_external, $host ) {
-        global $wpdb;
         static $queried = array();
         if ( $is_external )
                 return $is_external;
@@ -618 +616 @@
                 return true;
         if ( isset( $queried[ $host ] ) )
                 return $queried[ $host ];
+
+        $wpdb = WP::get( 'wpdb' );
         $queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
         return $queried[ $host ];
 }

src/wp-includes/link-template.php

@@ -1576 +1576 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param bool         $previous       Optional. Whether to retrieve previous post. Default true
@@ -1586 +1584 @@
  *                             corresponding post exists.
  */
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-        global $wpdb;
-
         if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
                 return null;
 
+        $wpdb = WP::get( 'wpdb' );
+
         $current_post_date = $post->post_date;
 
         $join = '';

src/wp-includes/load.php

@@ -388 +388 @@
  * Load the database class file and instantiate the `$wpdb` global.
  *
  * @since 2.5.0
- *
- * @global wpdb $wpdb The WordPress database class.
  */
 function require_wp_db() {
-        global $wpdb;
+        $wpdb = null;
 
         require_once( ABSPATH . WPINC . '/wp-db.php' );
-        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
+        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
                 require_once( WP_CONTENT_DIR . '/db.php' );
+        }
 
-        if ( isset( $wpdb ) )
+        if ( isset( $wpdb ) ) {
+                WP::set( 'wpdb', $wpdb, true );
                 return;
+        }
 
-        $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+        $db = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+
+        WP::set( 'wpdb', $db, true );
 }
 
 /**

src/wp-includes/media.php

@@ -3216 +3216 @@
  * @since 3.5.0
  *
  * @global int       $content_width
- * @global wpdb      $wpdb
  * @global WP_Locale $wp_locale
  *
  * @param array $args {
@@ -3230 +3229 @@
         if ( did_action( 'wp_enqueue_media' ) )
                 return;
 
-        global $content_width, $wpdb, $wp_locale;
+        global $content_width, $wp_locale;
 
         $defaults = array(
                 'post' => null,
@@ -3269 +3268 @@
                 }
         }
 
+        $wpdb = WP::get( 'wpdb' );
+
         $has_audio = $wpdb->get_var( "
                 SELECT ID
                 FROM $wpdb->posts
@@ -3743 +3744 @@
  *
  * @since 4.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $url The URL to resolve.
  * @return int The found post ID, or 0 on failure.
  */
 function attachment_url_to_postid( $url ) {
-        global $wpdb;
-
         $dir = wp_get_upload_dir();
         $path = $url;
 
@@ -3766 +3763 @@
                 $path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $sql = $wpdb->prepare(
                 "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
                 $path

src/wp-includes/meta.php

@@ -15 +15 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $meta_type  Type of object metadata is for (e.g., comment, post, or user)
  * @param int    $object_id  ID of the object metadata is for
  * @param string $meta_key   Metadata key
@@ -28 +26 @@
  * @return int|false The meta ID on success, false on failure.
  */
 function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = false) {
-        global $wpdb;
-
         if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) {
                 return false;
         }
@@ -71 +67 @@
         if ( null !== $check )
                 return $check;
 
+        $wpdb = WP::get( 'wpdb' );
         if ( $unique && $wpdb->get_var( $wpdb->prepare(
                 "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
                 $meta_key, $object_id ) ) )
@@ -130 +127 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $meta_type  Type of object metadata is for (e.g., comment, post, or user)
  * @param int    $object_id  ID of the object metadata is for
  * @param string $meta_key   Metadata key
@@ -141 +136 @@
  * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
  */
 function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') {
-        global $wpdb;
-
         if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) {
                 return false;
         }
@@ -197 +190 @@
                 }
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) );
         if ( empty( $meta_ids ) ) {
                 return add_metadata( $meta_type, $object_id, $raw_meta_key, $passed_value );
@@ -289 +283 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $meta_type  Type of object metadata is for (e.g., comment, post, or user)
  * @param int    $object_id  ID of the object metadata is for
  * @param string $meta_key   Metadata key
@@ -305 +297 @@
  * @return bool True on successful delete, false on failure.
  */
 function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false) {
-        global $wpdb;
-
         if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) && ! $delete_all ) {
                 return false;
         }
@@ -351 +341 @@
         $_meta_value = $meta_value;
         $meta_value = maybe_serialize( $meta_value );
 
+        $wpdb = WP::get( 'wpdb' );
+
         $query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
 
         if ( !$delete_all )
@@ -558 +550 @@
  *
  * @since 3.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, term, or user).
  * @param int    $meta_id   ID for a specific meta row
  * @return object|false Meta object or false.
  */
 function get_metadata_by_mid( $meta_type, $meta_id ) {
-        global $wpdb;
-
         if ( ! $meta_type || ! is_numeric( $meta_id ) ) {
                 return false;
         }
@@ -583 +571 @@
 
         $id_column = ( 'user' == $meta_type ) ? 'umeta_id' : 'meta_id';
 
+        $wpdb = WP::get( 'wpdb' );
         $meta = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $table WHERE $id_column = %d", $meta_id ) );
 
         if ( empty( $meta ) )
@@ -599 +588 @@
  *
  * @since 3.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $meta_type  Type of object metadata is for (e.g., comment, post, or user)
  * @param int    $meta_id    ID for a specific meta row
  * @param string $meta_value Metadata value
@@ -608 +595 @@
  * @return bool True on successful update, false on failure.
  */
 function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key = false ) {
-        global $wpdb;
-
         // Make sure everything is valid.
         if ( ! $meta_type || ! is_numeric( $meta_id ) ) {
                 return false;
@@ -664 +649 @@
                         do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
                 }
 
+                $wpdb = WP::get( 'wpdb' );
                 // Run the update query, all fields in $data are %s, $where is a %d.
                 $result = $wpdb->update( $table, $data, $where, '%s', '%d' );
                 if ( ! $result )
@@ -692 +678 @@
  *
  * @since 3.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, term, or user).
  * @param int    $meta_id   ID for a specific meta row
  * @return bool True on successful delete, false on failure.
  */
 function delete_metadata_by_mid( $meta_type, $meta_id ) {
-        global $wpdb;
-
         // Make sure everything is valid.
         if ( ! $meta_type || ! is_numeric( $meta_id ) ) {
                 return false;
@@ -742 +724 @@
                         do_action( "delete_{$meta_type}meta", $meta_id );
                 }
 
+                $wpdb = WP::get( 'wpdb' );
                 // Run the query, will return true if deleted, false otherwise
                 $result = (bool) $wpdb->delete( $table, array( $id_column => $meta_id ) );
 
@@ -779 +762 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string    $meta_type  Type of object metadata is for (e.g., comment, post, or user)
  * @param int|array $object_ids Array or comma delimited list of object IDs to update cache for
  * @return array|false Metadata cache for the specified objects, or false on failure.
  */
 function update_meta_cache($meta_type, $object_ids) {
-        global $wpdb;
-
         if ( ! $meta_type || ! $object_ids ) {
                 return false;
         }
@@ -823 +802 @@
         // Get meta info
         $id_list = join( ',', $ids );
         $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
+
+        $wpdb = WP::get( 'wpdb' );
         $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
 
         if ( !empty($meta_list) ) {
@@ -892 +873 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $type Type of object to get metadata table for (e.g., comment, post, or user)
  * @return string|false Metadata table name, or false if no metadata table exists
  */
 function _get_meta_table($type) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $table_name = $type . 'meta';
 

src/wp-includes/ms-blogs.php

@@ -12 +12 @@
  * Update the last_updated field for the current site.
  *
  * @since MU
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wpmu_update_blogs_date() {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
         /**
@@ -76 +74 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $slug
  * @return int A blog id
  */
 function get_id_from_blogname( $slug ) {
-        global $wpdb;
-
         $current_site = get_current_site();
         $slug = trim( $slug, '/' );
 
@@ -99 +93 @@
                 $path = $current_site->path . $slug . '/';
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
         wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
         return $blog_id;
@@ -109 +104 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|string|array $fields  Optional. A blog ID, a blog slug, or an array of fields to query against.
  *                                  If not specified the current blog ID is used.
  * @param bool             $get_all Whether to retrieve all details or only the details in the blogs table.
@@ -118 +111 @@
  * @return WP_Site|false Blog details on success. False on failure.
  */
 function get_blog_details( $fields = null, $get_all = true ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         if ( is_array($fields ) ) {
                 if ( isset($fields['blog_id']) ) {
@@ -293 +286 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int   $blog_id Blog ID
  * @param array $details Array of details keyed by blogs table field names.
  * @return bool True if update succeeds, false otherwise.
  */
 function update_blog_details( $blog_id, $details = array() ) {
-        global $wpdb;
-
         if ( empty($details) )
                 return false;
 
@@ -327 +316 @@
                 $update_details[ $field ] = $details[ $field ];
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
 
         if ( false === $result )
@@ -517 +507 @@
  * @access private
  *
  * @see update_site_cache()
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $ids ID list.
  */
 function _prime_site_caches( $ids ) {
-        global $wpdb;
-
         $non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
         if ( ! empty( $non_cached_ids ) ) {
+                $wpdb = WP::get( 'wpdb' );
                 $fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
 
                 update_site_cache( $fresh_sites );
@@ -752 +740 @@
  * @see restore_current_blog()
  * @since MU
  *
- * @global wpdb            $wpdb
  * @global int             $blog_id
  * @global array           $_wp_switched_stack
  * @global bool            $switched
@@ -764 +751 @@
  * @return true Always returns True.
  */
 function switch_to_blog( $new_blog, $deprecated = null ) {
-        global $wpdb;
-
         if ( empty( $new_blog ) )
                 $new_blog = $GLOBALS['blog_id'];
 
@@ -790 +775 @@
                 return true;
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->set_blog_id( $new_blog );
         $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
         $prev_blog_id = $GLOBALS['blog_id'];
@@ -836 +822 @@
  * @see switch_to_blog()
  * @since MU
  *
- * @global wpdb            $wpdb
  * @global array           $_wp_switched_stack
  * @global int             $blog_id
  * @global bool            $switched
@@ -846 +831 @@
  * @return bool True on success, false if we're already on the current blog
  */
 function restore_current_blog() {
-        global $wpdb;
-
         if ( empty( $GLOBALS['_wp_switched_stack'] ) )
                 return false;
 
@@ -861 +844 @@
                 return true;
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->set_blog_id( $blog );
         $prev_blog_id = $GLOBALS['blog_id'];
         $GLOBALS['blog_id'] = $blog;
@@ -947 +931 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int    $blog_id BLog ID
  * @param string $pref    A field name
  * @param string $value   Value for $pref
@@ -956 +938 @@
  * @return string|false $value
  */
 function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
-        global $wpdb;
-
         if ( null !== $deprecated  )
                 _deprecated_argument( __FUNCTION__, '3.1.0' );
 
@@ -964 +944 @@
         if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
                 return $value;
 
+        $wpdb = WP::get( 'wpdb' );
         $result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
 
         if ( false === $result )
@@ -1023 +1004 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int    $id   The blog id
  * @param string $pref A field name
  * @return bool|string|null $value
  */
 function get_blog_status( $id, $pref ) {
-        global $wpdb;
-
         $details = get_blog_details( $id, false );
         if ( $details )
                 return $details->$pref;
 
+        $wpdb = WP::get( 'wpdb' );
         return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
 }
 
@@ -1044 +1022 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param mixed $deprecated Not used
  * @param int   $start      The offset
  * @param int   $quantity   The maximum number of blogs to retrieve. Default is 40.
@@ -1052 +1028 @@
  * @return array The list of blogs
  */
 function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
-        global $wpdb;
-
         if ( ! empty( $deprecated ) )
                 _deprecated_argument( __FUNCTION__, 'MU' ); // never used
 
+        $wpdb = WP::get( 'wpdb' );
         return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
 }
 
@@ -1166 +1141 @@
  * @access private
  *
  * @see update_network_cache()
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $network_ids Array of network IDs.
  */
 function _prime_network_caches( $network_ids ) {
-        global $wpdb;
-
         $non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' );
         if ( !empty( $non_cached_ids ) ) {
+                $wpdb = WP::get( 'wpdb' );
                 $fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
 
                 update_network_cache( $fresh_networks );

src/wp-includes/ms-default-constants.php

@@ -14 +14 @@
  * wp-includes/ms-files.php (wp-content/blogs.php in MU).
  *
  * @since 3.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function ms_upload_constants() {
-        global $wpdb;
-
         // This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
         add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
@@ -33 +29 @@
         // Note, the main site in a post-MU network uses wp-content/uploads.
         // This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
         if ( ! defined( 'UPLOADS' ) ) {
+                $wpdb = WP::get( 'wpdb' );
                 define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
 
                 // Uploads dir relative to ABSPATH

src/wp-includes/ms-deprecated.php

@@ -185 +185 @@
 function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
         _deprecated_function( __FUNCTION__, '3.0.0', 'wp_get_sites()' );
 
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
         $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
 
         $blog_list = array();
@@ -417 +417 @@
  * @since MU 1.0
  * @deprecated 4.4.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $sitedomain Optional. Site domain.
  * @param string $path       Optional. Site path.
  * @return array|false The network admins
@@ -426 +424 @@
 function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
         _deprecated_function( __FUNCTION__, '4.4.0' );
 
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         if ( ! $sitedomain )
                 $site_id = $wpdb->siteid;
@@ -446 +444 @@
  * @deprecated 4.6.0
  * @see get_sites()
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param array $args {
  *     Array of default arguments. Optional.
  *
@@ -467 +463 @@
  *               values for whether the site is public, archived, mature, spam, and/or deleted.
  */
 function wp_get_sites( $args = array() ) {
-        global $wpdb;
-
         _deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' );
 
         if ( wp_is_large_network() )
                 return array();
 
+        $wpdb = WP::get( 'wpdb' );
+
         $defaults = array(
                 'network_id' => $wpdb->siteid,
                 'public'     => null,

src/wp-includes/ms-functions.php

@@ -34 +34 @@
  *
  * @since MU 1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $user_id The unique ID of the user
  * @return WP_Site|void The blog object
  */
 function get_active_blog_for_user( $user_id ) {
-        global $wpdb;
         $blogs = get_blogs_of_user( $user_id );
         if ( empty( $blogs ) )
                 return;
 
+        $wpdb = WP::get( 'wpdb' );
         if ( !is_multisite() )
                 return $blogs[$wpdb->blogid];
 
@@ -194 +192 @@
  *
  * @since MU 1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int    $user_id  ID of the user you're removing.
  * @param int    $blog_id  ID of the blog you're removing the user from.
  * @param string $reassign Optional. A user to whom to reassign posts.
@@ -202 +198 @@
  * @return true|WP_Error
  */
 function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
-        global $wpdb;
         switch_to_blog($blog_id);
         $user_id = (int) $user_id;
         /**
@@ -250 +245 @@
         }
 
         if ( $reassign != '' ) {
+                $wpdb = WP::get( 'wpdb' );
                 $reassign = (int) $reassign;
                 $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id ) );
                 $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id ) );
@@ -297 +293 @@
  *
  * @since MU 2.6.5
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $domain
  * @param string $path   Optional. Not required for subdomain installations.
  * @return int 0 if no blog found, otherwise the ID of the matching blog
@@ -401 +395 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $user_name  The login name provided by the user.
  * @param string $user_email The email provided by the user.
  * @return array Contains username, email, and error messages.
  */
 function wpmu_validate_user_signup($user_name, $user_email) {
-        global $wpdb;
-
         $errors = new WP_Error();
 
         $orig_username = $user_name;
@@ -474 +464 @@
         if ( email_exists($user_email) )
                 $errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
 
+        $wpdb = WP::get( 'wpdb' );
         // Has someone already signed up for this username?
         $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
         if ( $signup != null ) {
@@ -535 +526 @@
  *
  * @since MU
  *
- * @global wpdb   $wpdb
  * @global string $domain
  *
  * @param string         $blogname   The blog name provided by the user. Must be unique.
@@ -544 +534 @@
  * @return array Contains the new site data and error messages.
  */
 function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
-        global $wpdb, $domain;
+        global $domain;
 
         $current_site = get_current_site();
         $base = $current_site->path;
@@ -579 +569 @@
         if ( strlen( $blogname ) < 4 && !is_super_admin() )
                 $errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
 
+        $wpdb = WP::get( 'wpdb' );
         // do not allow users to create a blog that conflicts with a page on the main blog.
         if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
                 $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
@@ -657 +648 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $domain     The requested domain.
  * @param string $path       The requested path.
  * @param string $title      The requested site title.
@@ -667 +656 @@
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  */
 function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
-        global $wpdb;
-
         $key = substr( md5( time() . rand() . $domain ), 0, 16 );
         $meta = serialize($meta);
 
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->insert( $wpdb->signups, array(
                 'domain' => $domain,
                 'path' => $path,
@@ -707 +695 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $user       The user's requested login name.
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, this is an empty array.
  */
 function wpmu_signup_user( $user, $user_email, $meta = array() ) {
-        global $wpdb;
-
         // Format data
         $user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
         $user_email = sanitize_email( $user_email );
@@ -722 +706 @@
         $key = substr( md5( time() . rand() . $user_email ), 0, 16 );
         $meta = serialize($meta);
 
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->insert( $wpdb->signups, array(
                 'domain' => '',
                 'path' => '',
@@ -947 +932 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $key The activation key provided to the user.
  * @return array|WP_Error An array containing information about the activated user and/or blog
  */
 function wpmu_activate_signup($key) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
@@ -1252 +1235 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $domain  The domain to be checked.
  * @param string $path    The path to be checked.
  * @param int    $site_id Optional. Relevant only on multi-network installs.
@@ -1291 +1272 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $domain  The domain of the new site.
  * @param string $path    The path of the new site.
  * @param int    $site_id Unless you're running a multi-network install, be sure to set this value to 1.
@@ -1299 +1278 @@
  * @return int|false The ID of the new row
  */
 function insert_blog($domain, $path, $site_id) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $path = trailingslashit($path);
         $site_id = (int) $site_id;
@@ -1325 +1304 @@
  *
  * @since MU
  *
- * @global wpdb     $wpdb
  * @global WP_Roles $wp_roles
  *
  * @param int    $blog_id    The value returned by insert_blog().
@@ -1332 +1310 @@
  * @param string $blog_title The title of the new site.
  */
 function install_blog( $blog_id, $blog_title = '' ) {
-        global $wpdb, $wp_roles, $current_site;
+        global $wp_roles, $current_site;
 
+        $wpdb = WP::get( 'wpdb' );
+
         // Cast for security
         $blog_id = (int) $blog_id;
 
@@ -1393 +1373 @@
  * @deprecated MU
  * @deprecated Use wp_install_defaults()
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $blog_id Ignored in this function.
  * @param int $user_id
  */
 function install_blog_defaults($blog_id, $user_id) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
@@ -1618 +1596 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $user_id
  * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
  */
 function get_most_recent_post_of_user( $user_id ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $user_blogs = get_blogs_of_user( (int) $user_id );
         $most_recent_post = array();
@@ -1765 +1741 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $deprecated Not used.
  */
 function update_posts_count( $deprecated = '' ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
         update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) );
 }
 
@@ -1779 +1753 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $blog_id
  * @param int $user_id
  */
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
-        global $wpdb;
         $user = get_userdata( (int) $user_id );
-        if ( $user )
+        if ( $user ) {
+                $wpdb = WP::get( 'wpdb' );
                 $wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+        }
 }
 
 /**
@@ -1798 +1771 @@
  *
  * @see term_id_filter
  *
- * @global wpdb $wpdb WordPress database abstraction object.
  * @staticvar int $global_terms_recurse
  *
  * @param int    $term_id    An ID for a term on the current blog.
@@ -1806 +1778 @@
  * @return int An ID from the global terms table mapped from $term_id.
  */
 function global_terms( $term_id, $deprecated = '' ) {
-        global $wpdb;
         static $global_terms_recurse = null;
 
         if ( !global_terms_enabled() )
@@ -1822 +1793 @@
         }
 
         $term_id = intval( $term_id );
+        $wpdb = WP::get( 'wpdb' );
         $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
 
         $global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
@@ -2082 +2054 @@
  *
  * @since MU
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $key
  * @param int    $user_id Optional. Defaults to current user.
  * @param int    $blog_id Optional. Defaults to current blog.
@@ -2090 +2060 @@
  * @return bool
  */
 function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
-        global $wpdb;
-
+        $wpdb = WP::get( 'wpdb' );
         $current_user = wp_get_current_user();
         if ( $blog_id == 0 ) {
                 $blog_id = $wpdb->blogid;
@@ -2257 +2226 @@
  * Update the network-wide site count.
  *
  * @since 3.7.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wp_update_network_site_counts() {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $count = get_sites( array(
                 'network_id' => $wpdb->siteid,
@@ -2278 +2245 @@
  * Update the network-wide user count.
  *
  * @since 3.7.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wp_update_network_user_counts() {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
         update_site_option( 'user_count', $count );

src/wp-includes/ms-load.php

@@ -157 +157 @@
  *
  * @since 3.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string   $domain   Domain to check.
  * @param string   $path     Path to check.
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
@@ -277 +275 @@
  * @since 4.6.0
  * @access private
  *
- * @global wpdb       $wpdb         WordPress database abstraction object.
  * @global WP_Network $current_site The current network.
  * @global WP_Site    $current_blog The current site.
  *
@@ -290 +287 @@
  *                     Redirect URL if parts exist, but the request as a whole can not be fulfilled.
  */
 function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) {
-        global $wpdb, $current_site, $current_blog;
+        global $current_site, $current_blog;
 
+        $wpdb = WP::get( 'wpdb' );
+
         // If the network is defined in wp-config.php, we can simply use that.
         if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
                 $current_site = new stdClass;
@@ -454 +453 @@
  * @since 3.0.0
  * @since 4.4.0 The `$domain` and `$path` parameters were added.
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $domain The requested domain for the error to reference.
  * @param string $path   The requested path for the error to reference.
  */
 function ms_not_installed( $domain, $path ) {
-        global $wpdb;
-
         if ( ! is_admin() ) {
                 dead_db();
         }
@@ -473 +468 @@
         $msg  = '<h1>' . $title . '</h1>';
         $msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
         $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
+
+        $wpdb = WP::get( 'wpdb' );
         $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
         if ( ! $wpdb->get_var( $query ) ) {
                 $msg .= '<p>' . sprintf(

src/wp-includes/ms-settings.php

@@ -85 +85 @@
         wp_load_core_site_options( $site_id );
 }
 
+$wpdb = WP::get( 'wpdb' );
+
 $wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
 $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
 $table_prefix = $wpdb->get_blog_prefix();

src/wp-includes/option.php

@@ -21 +21 @@
  *
  * @since 1.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $option  Name of option to retrieve. Expected to not be SQL-escaped.
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
 function get_option( $option, $default = false ) {
-        global $wpdb;
-
         $option = trim( $option );
         if ( empty( $option ) )
                 return false;
@@ -83 +79 @@
                         $value = wp_cache_get( $option, 'options' );
 
                         if ( false === $value ) {
+                                $wpdb = WP::get( 'wpdb' );
                                 $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
 
                                 // Has to be get_row instead of get_var because of funkiness with 0, false, null values
@@ -102 +99 @@
                         }
                 }
         } else {
+                $wpdb = WP::get( 'wpdb' );
                 $suppress = $wpdb->suppress_errors();
                 $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
                 $wpdb->suppress_errors( $suppress );
@@ -167 +165 @@
  *
  * @since 2.2.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @return array List of all options.
  */
 function wp_load_alloptions() {
-        global $wpdb;
-
         if ( ! wp_installing() || ! is_multisite() )
                 $alloptions = wp_cache_get( 'alloptions', 'options' );
         else
@@ -180 +174 @@
                 $alloptions = false;
 
         if ( !$alloptions ) {
+                $wpdb = WP::get( 'wpdb' );
                 $suppress = $wpdb->suppress_errors();
                 if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
                         $alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
@@ -200 +195 @@
  *
  * @since 3.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
 function wp_load_core_site_options( $site_id = null ) {
-        global $wpdb;
-
         if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
                 return;
 
+        $wpdb = WP::get( 'wpdb' );
         if ( empty($site_id) )
                 $site_id = $wpdb->siteid;
 
@@ -240 +232 @@
  * @since 1.0.0
  * @since 4.2.0 The `$autoload` parameter was added.
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string      $option   Option name. Expected to not be SQL-escaped.
  * @param mixed       $value    Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
  * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. For existing options,
@@ -251 +241 @@
  * @return bool False if value was not updated and true if value was updated.
  */
 function update_option( $option, $value, $autoload = null ) {
-        global $wpdb;
-
         $option = trim($option);
         if ( empty($option) )
                 return false;
@@ -325 +313 @@
                 $update_args['autoload'] = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
         if ( ! $result )
                 return false;
@@ -386 +375 @@
  *
  * @since 1.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string         $option      Name of option to add. Expected to not be SQL-escaped.
  * @param mixed          $value       Optional. Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
  * @param string         $deprecated  Optional. Description. Not used anymore.
@@ -396 +383 @@
  * @return bool False if option was not added and true if option was added.
  */
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
-        global $wpdb;
-
         if ( !empty( $deprecated ) )
                 _deprecated_argument( __FUNCTION__, '2.3.0' );
 
@@ -432 +417 @@
          */
         do_action( 'add_option', $option, $value );
 
+        $wpdb = WP::get( 'wpdb' );
         $result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
         if ( ! $result )
                 return false;
@@ -483 +469 @@
  *
  * @since 1.2.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
 function delete_option( $option ) {
-        global $wpdb;
-
         $option = trim( $option );
         if ( empty( $option ) )
                 return false;
@@ -497 +479 @@
 
         wp_protect_special_option( $option );
 
+        $wpdb = WP::get( 'wpdb' );
         // Get the ID, if no ID then return
         $row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
         if ( is_null( $row ) )
@@ -1069 +1052 @@
  *
  * @see get_option()
  *
- * @global wpdb   $wpdb
  * @global object $current_site
  *
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
@@ -1078 +1060 @@
  * @return mixed Value set for the option.
  */
 function get_network_option( $network_id, $option, $default = false ) {
-        global $wpdb, $current_site;
+        global $current_site;
 
         if ( $network_id && ! is_numeric( $network_id ) ) {
                 return false;
@@ -1142 +1124 @@
                 $value = wp_cache_get( $cache_key, 'site-options' );
 
                 if ( ! isset( $value ) || false === $value ) {
+                        $wpdb = WP::get( 'wpdb' );
                         $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
 
                         // Has to be get_row instead of get_var because of funkiness with 0, false, null values
@@ -1186 +1169 @@
  *
  * @see add_option()
  *
- * @global wpdb   $wpdb
  * @global object $current_site
  *
  * @param int    $network_id ID of the network. Can be null to default to the current network ID.
@@ -1195 +1177 @@
  * @return bool False if option was not added and true if option was added.
  */
 function add_network_option( $network_id, $option, $value ) {
-        global $wpdb, $current_site;
+        global $current_site;
 
         if ( $network_id && ! is_numeric( $network_id ) ) {
                 return false;
@@ -1242 +1224 @@
                 $value = sanitize_option( $option, $value );
 
                 $serialized_value = maybe_serialize( $value );
+                $wpdb = WP::get( 'wpdb' );
                 $result = $wpdb->insert( $wpdb->sitemeta, array( 'site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value ) );
 
                 if ( ! $result ) {
@@ -1296 +1279 @@
  *
  * @see delete_option()
  *
- * @global wpdb   $wpdb
  * @global object $current_site
  *
  * @param int    $network_id ID of the network. Can be null to default to the current network ID.
@@ -1304 +1286 @@
  * @return bool True, if succeed. False, if failure.
  */
 function delete_network_option( $network_id, $option ) {
-        global $wpdb, $current_site;
+        global $current_site;
 
         if ( $network_id && ! is_numeric( $network_id ) ) {
                 return false;
@@ -1332 +1314 @@
         if ( ! is_multisite() ) {
                 $result = delete_option( $option );
         } else {
+                $wpdb = WP::get( 'wpdb' );
                 $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
                 if ( is_null( $row ) || ! $row->meta_id ) {
                         return false;
@@ -1378 +1361 @@
  *
  * @see update_option()
  *
- * @global wpdb   $wpdb
  * @global object $current_site
  *
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
@@ -1387 +1369 @@
  * @return bool False if value was not updated and true if value was updated.
  */
 function update_network_option( $network_id, $option, $value ) {
-        global $wpdb, $current_site;
+        global $current_site;
 
         if ( $network_id && ! is_numeric( $network_id ) ) {
                 return false;
@@ -1440 +1422 @@
                 $value = sanitize_option( $option, $value );
 
                 $serialized_value = maybe_serialize( $value );
+                $wpdb = WP::get( 'wpdb' );
                 $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );
 
                 if ( $result ) {

src/wp-includes/pluggable.php

@@ -114 +114 @@
  *
  * @since 3.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param array $user_ids User ID numbers list
  */
 function cache_users( $user_ids ) {
-        global $wpdb;
-
         $clean = _get_non_cached_ids( $user_ids, 'users' );
 
         if ( empty( $clean ) )
@@ -128 +124 @@
 
         $list = implode( ',', $clean );
 
+        $wpdb = WP::get( 'wpdb' );
         $users = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($list)" );
 
         $ids = array();
@@ -1528 +1525 @@
  *
  * @since 1.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * Uses the {@see 'notify_moderator'} filter to determine whether the site moderator
  * should be notified, overriding the site setting.
  *
@@ -1537 +1532 @@
  * @return true Always returns true.
  */
 function wp_notify_moderator($comment_id) {
-        global $wpdb;
-
         $maybe_notify = get_option( 'moderation_notify' );
 
         /**
@@ -1566 +1559 @@
         }
 
         $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
+        $wpdb = WP::get( 'wpdb' );
         $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
 
         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
@@ -1698 +1692 @@
  * @since 4.3.1 The `$plaintext_pass` parameter was deprecated. `$notify` added as a third parameter.
  * @since 4.6.0 The `$notify` parameter accepts 'user' for sending notification only to the user created.
  *
- * @global wpdb         $wpdb      WordPress database object for queries.
  * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
  *
  * @param int    $user_id    User ID.
@@ -1711 +1704 @@
                 _deprecated_argument( __FUNCTION__, '4.3.1' );
         }
 
-        global $wpdb, $wp_hasher;
+        global $wp_hasher;
         $user = get_userdata( $user_id );
 
         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
@@ -1743 +1736 @@
                 $wp_hasher = new PasswordHash( 8, true );
         }
         $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
 
         $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
@@ -2213 +2207 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $password The plaintext new user password
  * @param int    $user_id  User ID
  */
 function wp_set_password( $password, $user_id ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $hash = wp_hash_password( $password );
         $wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) );

src/wp-includes/post.php

@@ -1498 +1498 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int    $post_id   Optional. Post ID to change post type. Default 0.
  * @param string $post_type Optional. Post type. Accepts 'post' or 'page' to
  *                          name a few. Default 'post'.
@@ -1506 +1504 @@
  * @return int|false Amount of rows changed. Should be 1 for success and 0 for failure.
  */
 function set_post_type( $post_id = 0, $post_type = 'post' ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $post_type = sanitize_post_field('post_type', $post_type, $post_id, 'db');
         $return = $wpdb->update( $wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
@@ -2085 +2083 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string $type Optional. Post type to retrieve count. Default 'post'.
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return object Number of posts for each status.
  */
 function wp_count_posts( $type = 'post', $perm = '' ) {
-        global $wpdb;
-
         if ( ! post_type_exists( $type ) )
                 return new stdClass;
 
@@ -2105 +2099 @@
                 return apply_filters( 'wp_count_posts', $counts, $type, $perm );
         }
 
+        $wpdb = WP::get( 'wpdb' );
         $query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
         if ( 'readable' == $perm && is_user_logged_in() ) {
                 $post_type_object = get_post_type_object($type);
@@ -2150 +2145 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param string|array $mime_type Optional. Array or comma-separated list of
  *                                MIME patterns. Default empty.
  * @return object An object containing the attachment counts by mime type.
  */
 function wp_count_attachments( $mime_type = '' ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );
 
         $and = wp_post_mime_type_where( $mime_type );
         $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
@@ -2319 +2312 @@
  *
  * @since 1.0.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
  * @see wp_delete_attachment()
  * @see wp_trash_post()
  *
@@ -2329 +2321 @@
  * @return array|false|WP_Post False on failure.
  */
 function wp_delete_post( $postid = 0, $force_delete = false ) {
-        global $wpdb;
+        $wpdb = WP::get( 'wpdb' );;
 
         if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
                 return $post;
@@ -2582 +2574 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
 function wp_trash_post_comments( $post = null ) {
-        global $wpdb;
-
         $post = get_post($post);
         if ( empty($post) )
                 return;
@@ -2605 +2593 @@
          */
         do_action( 'trash_post_comments', $post_id );
 
+        $wpdb = WP::get( 'wpdb' );
         $comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
         if ( empty($comments) )
                 return;
@@ -2638 +2627 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return true|void
  */
 function wp_untrash_post_comments( $post = null ) {
-        global $wpdb;
-
         $post = get_post($post);
         if ( empty($post) )
                 return;
@@ -2671 +2656 @@
         foreach ( $statuses as $comment_id => $comment_status )
                 $group_by_status[$comment_status][] = $comment_id;
 
+        $wpdb = WP::get( 'wpdb' );
         foreach ( $group_by_status as $status => $comments ) {
                 // Sanity check. This shouldn't happen.
                 if ( 'post-trashed' == $status ) {
@@ -2824 +2810 @@
  * @since 4.4.0 A 'meta_input' array can now be passed to `$postarr` to add post meta data.
  *
  * @see sanitize_post()
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $postarr {
  *     An array of elements that make up a post to update or insert.
@@ -2870 +2855 @@
  * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure.
  */
 function wp_insert_post( $postarr, $wp_error = false ) {
-        global $wpdb;
-
         $user_id = get_current_user_id();
 
         $defaults = array(
@@ -3154 +3137 @@
 
         $emoji_fields = array( 'post_title', 'post_content', 'post_excerpt' );
 
+        $wpdb = WP::get( 'wpdb' );
         foreach ( $emoji_fields as $emoji_field ) {
                 if ( isset( $data[ $emoji_field ] ) ) {
                         $charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field );
@@ -3487 +3471 @@
  *
  * @since 2.1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int|WP_Post $post Post ID or post object.
  */
 function wp_publish_post( $post ) {
-        global $wpdb;
-
         if ( ! $post = get_post( $post ) )
                 return;
 
@@ -3500 +3480 @@
         if ( 'publish' == $post->post_status )
                 return;
 
+        $wpdb = WP::get( 'wpdb' );
         $wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
 
         clean_post_cache( $post->ID );