Changeset 15574

Timestamp:

09/05/2010 06:47:25 PM (14 years ago)

Author:

scribu

Message:

Use get_users() in wp_dropdown_users(). See #14572

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• user.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -2981 +2981 @@
 
 /**
+ * Extract a slice of an array, given a list of keys
+ *
+ * @since 3.1.0
+ *
+ * @param array $array The original array
+ * @param array $keys The list of keys
+ * @return array The array slice
+ */
+function wp_array_slice_assoc( $array, $keys ) {
+    $slice = array();
+    foreach ( $keys as $key )
+        if ( isset( $array[ $key ] ) )
+            $slice[ $key ] = $array[ $key ];
+
+    return $slice;
+}
+
+/**
  * Filters a list of objects, based on a set of key => value arguments
  *

trunk/wp-includes/user.php

@@ -462 +462 @@
         }
 
-        $meta_query = array();
-        foreach ( array( 'meta_key', 'meta_value', 'meta_compare' ) as $key )
-            if ( isset( $qv[ $key ] ) )
-                $meta_query[ $key ] = $qv[ $key ];
-        $meta_queries[] = $meta_query;
+        $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
 
         $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id', $wpdb->usermeta );
@@ -832 +828 @@
     extract( $r, EXTR_SKIP );
 
-    $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
-    $query = "SELECT {$wpdb->users}.* FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities'";
-
-    $query_where = array();
-
-    if ( is_array($include) )
-        $include = join(',', $include);
-    $include = preg_replace('/[^0-9,]/', '', $include); // (int)
-    if ( $include )
-        $query_where[] = "ID IN ($include)";
-
-    if ( is_array($exclude) )
-        $exclude = join(',', $exclude);
-    $exclude = preg_replace('/[^0-9,]/', '', $exclude); // (int)
-    if ( $exclude )
-        $query_where[] = "ID NOT IN ($exclude)";
-
-    if ( $query_where )
-        $query .= " AND " . join(' AND', $query_where);
-
-    $query .= " ORDER BY $orderby $order";
-
-    $users = $wpdb->get_results( $query );
+    $users = get_users( wp_array_slice_assoc( $args, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
 
     $output = '';