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

Timestamp:

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

Author:

wonderboymusic

Message:

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

See #37699.

File:

• trunk/src/wp-includes/class-wp-term-query.php (modified) (9 diffs)

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

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