Changeset 18597 for trunk/wp-includes/pluggable.php

Timestamp:

08/24/2011 07:32:59 PM (12 years ago)

Author:

ryan

Message:

Introduce metadata_exists(), WP_User::get_data_by(), WP_User::get(), WP_User::has_prop(). Don't fill user objects with meta. Eliminate data duplication in cache and memory. Props scribu. see #15458

File:

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

trunk/wp-includes/pluggable.php

@@ -99 +99 @@
  *
  * @param int $user_id User ID
- * @return bool|object False on failure, User DB row object
+ * @return bool|object False on failure, WP_User object on success
  */
 function get_userdata( $user_id ) {
+    return get_user_by( 'id', $user_id );
+}
+endif;
+
+if ( !function_exists('get_user_by') ) :
+/**
+ * Retrieve user info by a given field
+ *
+ * @since 2.8.0
+ *
+ * @param string $field The field to retrieve the user with.  id | slug | email | login
+ * @param int|string $value A value for $field.  A user ID, slug, email address, or login name.
+ * @return bool|object False on failure, WP_User object on success
+ */
+function get_user_by( $field, $value ) {
+    $userdata = WP_User::get_data_by( $field, $value );
+
+    if ( !$userdata )
+        return false;
+
+    $user = new WP_User;
+    $user->init( $userdata );
+
+    return $user;
+}
+endif;
+
+if ( !function_exists('cache_users') ) :
+/**
+ * Retrieve info for user lists to prevent multiple queries by get_userdata()
+ *
+ * @since 3.0.0
+ *
+ * @param array $user_ids User ID numbers list
+ */
+function cache_users( $user_ids ) {
     global $wpdb;
 
-    if ( ! is_numeric( $user_id ) )
-        return false;
-
-    $user_id = absint( $user_id );
-    if ( ! $user_id )
-        return false;
-
-    $user = wp_cache_get( $user_id, 'users' );
-
-    if ( $user )
-        return $user;
-
-    if ( ! $user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d LIMIT 1", $user_id ) ) )
-        return false;
-
-    _fill_user( $user );
-
-    return $user;
-}
-endif;
-
-if ( !function_exists('cache_users') ) :
-/**
- * Retrieve info for user lists to prevent multiple queries by get_userdata()
- *
- * @since 3.0.0
- *
- * @param array $users User ID numbers list
- */
-function cache_users( $users ) {
-    global $wpdb;
-
     $clean = array();
-    foreach($users as $id) {
+    foreach ( $user_ids as $id ) {
         $id = (int) $id;
-        if (wp_cache_get($id, 'users')) {
-            // seems to be cached already
-        } else {
+        if ( !wp_cache_get( $id, 'users' ) ) {
             $clean[] = $id;
         }
     }
 
-    if ( 0 == count($clean) )
+    if ( empty( $clean ) )
         return;
 
-    $list = implode(',', $clean);
-
-    $results = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($list)");
-
-    _fill_many_users($results);
-}
-endif;
-
-if ( !function_exists('get_user_by') ) :
-/**
- * Retrieve user info by a given field
- *
- * @since 2.8.0
- *
- * @param string $field The field to retrieve the user with.  id | slug | email | login
- * @param int|string $value A value for $field.  A user ID, slug, email address, or login name.
- * @return bool|object False on failure, User DB row object
- */
-function get_user_by($field, $value) {
-    global $wpdb;
-
-    switch ($field) {
-        case 'id':
-            return get_userdata($value);
-            break;
-        case 'slug':
-            $user_id = wp_cache_get($value, 'userslugs');
-            $field = 'user_nicename';
-            break;
-        case 'email':
-            $user_id = wp_cache_get($value, 'useremail');
-            $field = 'user_email';
-            break;
-        case 'login':
-            $value = sanitize_user( $value );
-            $user_id = wp_cache_get($value, 'userlogins');
-            $field = 'user_login';
-            break;
-        default:
-            return false;
-    }
-
-     if ( false !== $user_id )
-        return get_userdata($user_id);
-
-    if ( !$user = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->users WHERE $field = %s", $value) ) )
-        return false;
-
-    _fill_user($user);
-
-    return $user;
+    $list = implode( ',', $clean );
+
+    $users = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($list)" );
+
+    $ids = array();
+    foreach ( $users as $user ) {
+        update_user_caches( $user );
+        $ids[] = $user->ID;
+    }
+    update_meta_cache( 'user', $ids );
 }
 endif;