Changeset 38768 for trunk/src/wp-includes/class-wp-tax-query.php

Timestamp:

10/10/2016 06:37:02 AM (8 years ago)

Author:

pento

Message:

General: Restore usage of $wpdb, instead of $this->db.

Hiding the $wpdb global behind a property decreases the readability of the code, as well as causing irrelevant output when dumping an object.

Reverts [38275], [38278], [38279], [38280], [38387].
See #37699.

File:

• trunk/src/wp-includes/class-wp-tax-query.php (modified) (13 diffs)

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

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