Changeset 16053

Timestamp:

10/28/2010 05:02:37 PM (16 years ago)

Author:

scribu

Message:

Make get_meta_sql() return associative array. See #15032

Location:

trunk/wp-includes

Files:

• class.wp-object-query.php (modified) (1 diff)
• query.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/class.wp-object-query.php

@@ -157 +157 @@
                 }
 
-                return array( $join, $where );
+                return compact( 'join', 'where' );
         }
 

trunk/wp-includes/query.php

@@ -2120 +2120 @@
 
                 if ( !empty( $q['meta_query'] ) ) {
-                        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;
+                        $clauses = $this->get_meta_sql( $q['meta_query'], $wpdb->posts, 'ID', $wpdb->postmeta, 'post_id' );
+                        $join .= $clauses['join'];
+                        $where .= $clauses['where'];
                 }
 

trunk/wp-includes/user.php

@@ -469 +469 @@
 
                 if ( !empty( $qv['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;
+                        $clauses = $this->get_meta_sql( $qv['meta_query'], $wpdb->users, 'ID', $wpdb->usermeta, 'user_id' );
+                        $this->query_from .= $clauses['join'];
+                        $this->query_where .= $clauses['where'];
                 }