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