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

Timestamp:

10/10/2016 06:37:02 AM (9 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-meta-query.php (modified) (10 diffs)

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

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