Changeset 15766

Timestamp:

10/09/2010 10:48:13 AM (16 years ago)

Author:

scribu

Message:

Get rid of redundant $this->meta_query. See #14645

Location:

trunk/wp-includes

Files:

• classes.php (modified) (4 diffs)
• query.php (modified) (2 diffs)
• user.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -545 +545 @@
 class WP_Object_Query {
 
-        /**
-         * List of metadata queries
-         *
-         * A query is an associative array:
+        /*
+         * Populates the $meta_query property
+         *
+         * @access protected
+         * @since 3.1.0
+         *
+         * @param array $qv The query variables
+         */
+        function parse_meta_query( &$qv ) {
+                $meta_query = array();
+
+                // Simple query needs to be first for orderby=meta_value to work correctly
+                foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
+                        if ( !empty( $qv[ "meta_$key" ] ) )
+                                $meta_query[0][ $key ] = $qv[ "meta_$key" ];
+                }
+
+                if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
+                        $meta_query = array_merge( $meta_query, $qv['meta_query'] );
+                }
+
+                $qv['meta_query'] = $meta_query;
+        }
+
+        /*
+         * Used internally to generate an SQL string for searching across multiple meta key = value pairs
+         *
+         * @access protected
+         * @since 3.1.0
+         *
+         * @param array $meta_query List of metadata queries. A single query is an associative array:
          * - 'key' string The meta key
          * - 'value' string|array The meta value
@@ -558 +585 @@
          *              Default: 'CHAR'
          *
-         * @since 3.1.0
-         * @access public
-         * @var array
-         */
-        var $meta_query = array();
-
-        /*
-         * Populates the $meta_query property
-         *
-         * @access protected
-         * @since 3.1.0
-         *
-         * @param array $qv The query variables
-         */
-        function parse_meta_query( $qv ) {
-                if ( ! empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
-                        $this->meta_query = $qv['meta_query'];
-                }
-
-                $meta_query = array();
-                foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
-                        if ( ! empty( $qv[ "meta_$key" ] ) )
-                                $meta_query[ $key ] = $qv[ "meta_$key" ];
-                }
-
-                if ( ! empty( $meta_query ) ) {
-                        array_unshift( $this->meta_query, $meta_query );
-                }
-        }
-
-        /*
-         * Used internally to generate an SQL string for searching across multiple meta key = value pairs
-         *
-         * @access protected
-         * @since 3.1.0
-         *
-         * @uses $this->meta_query
-         *
          * @param string $primary_table
          * @param string $primary_id_column
@@ -602 +591 @@
          * @return array( $join_sql, $where_sql )
          */
-        function get_meta_sql( $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
+        function get_meta_sql( $meta_query, $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
                 global $wpdb;
 
@@ -610 +599 @@
                 $where = '';
                 $i = 0;
-                foreach ( $this->meta_query as $q ) {
+                foreach ( $meta_query as $q ) {
                         $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
                         $meta_value = isset( $q['value'] ) ? $q['value'] : '';

trunk/wp-includes/query.php

@@ -1082 +1082 @@
                 unset($this->query);
                 $this->query_vars = array();
-                $this->meta_query = array();
                 unset($this->queried_object);
                 unset($this->queried_object_id);
@@ -2115 +2114 @@
                 }
 
-                list( $meta_join, $meta_where ) = $this->get_meta_sql( $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
+                list( $meta_join, $meta_where ) = $this->get_meta_sql( $q['meta_query'], $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
                 $join .= $meta_join;
                 $where .= $meta_where;

trunk/wp-includes/user.php

@@ -459 +459 @@
                         }
 
-                        $this->meta_query[] = $cap_meta_query;
-                }
-
-                list( $meta_join, $meta_where ) = $this->get_meta_sql( $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
+                        $qv['meta_query'][] = $cap_meta_query;
+                }
+
+                list( $meta_join, $meta_where ) = $this->get_meta_sql( $qv['meta_query'], $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
                 $this->query_from .= $meta_join;
                 $this->query_where .= $meta_where;