Changeset 15768 for trunk/wp-includes/user.php

Timestamp:

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

Author:

scribu

Message:

Fix warning caused by empty meta query. See #14645

File:

• trunk/wp-includes/user.php (modified) (1 diff)

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)";