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

Timestamp:

08/27/2010 12:18:57 AM (14 years ago)

Author:

scribu

Message:

use get_users() in get_editable_user_ids() and cache result. See #14572

File:

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

trunk/wp-includes/user.php

@@ -435 +435 @@
 
         $role = trim( $qv['role'] );
+
+        if ( $role || is_multisite() ) {
+            $this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
+            $this->query_where .= $wpdb->prepare( " AND $wpdb->usermeta.meta_key = %s", $wpdb->prefix . 'capabilities' );
+        }
+
         if ( $role ) {
-            $this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
-            $this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $role . '%');
-        } elseif ( is_multisite() ) {
-            $level_key = $wpdb->prefix . 'capabilities'; // wpmu site admins don't have user_levels
-            $this->query_from .= ", $wpdb->usermeta";
-            $this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
+            $this->query_where .= $wpdb->prepare( " AND $wpdb->usermeta.meta_value LIKE %s", '%' . like_escape( $role ) . '%' );
         }