Changeset 15768

Timestamp:

10/09/2010 12:18:52 PM (14 years ago)

Author:

scribu

Message:

Fix warning caused by empty meta query. See #14645

Location:

trunk/wp-includes

Files:

• query.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/query.php

@@ -2114 +2114 @@
         }
 
-        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;
+        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;
+        }
 
         // Apply filters on where and join prior to paging so that any

trunk/wp-includes/user.php

@@ -462 +462 @@
         }
 
-        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;
-
-        if ( !empty($qv['include']) ) {
+        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;
+        }
+
+        if ( !empty( $qv['include'] ) ) {
             $ids = implode( ',', wp_parse_id_list( $qv['include'] ) );
             $this->query_where .= " AND $wpdb->users.ID IN ($ids)";