Changeset 105

Timestamp:

08/06/08 22:04:17 (4 months ago)

Author:

mdawaffe

Message:

WP_Users::get_user(): return WP_Error when multiple rows match single user request

Files:

• trunk/includes/class.wp-users.php (modified) (5 diffs)

trunk/includes/class.wp-users.php

@@ -164 +164 @@
-        function get_user( $user_id = 0, $args = null ) {
-                $defaults = array( 'output' => OBJECT, 'by' => false );
-
+
+
-
-                if ( is_array( $user_id ) ) {
@@ -187 +188 @@
-                                        return $user;
-                                }
- = "SELECT * FROM {$this->db->users} WHERE ID = %d"
+_field = 'ID'
-                        } elseif ( 'email' == $by ) {
-                                if ( !$this->is_email( $user_id ) )
@@ -197 +198 @@
-                                        return $this->get_user( $ID, $args );
-                                }
- = "SELECT * FROM {$this->db->users} WHERE user_email = %s"
+_field = 'user_email'
-                        } elseif ( 'nicename' == $by ) { // No cache?
-                                $user_id = $this->sanitize_nicename( $user_id );
- = "SELECT * FROM {$this->db->users} WHERE user_nicename = %s"
+_field = 'user_nicename'
-                        } else {
-                                $user_id = $this->sanitize_user( $user_id );
@@ -207 +208 @@
-                                elseif ( $ID )
-                                        return $this->get_user( $ID, $args );
- = "SELECT * FROM {$this->db->users} WHERE user_login = %s"
+_field = 'user_login'
-                        }
-
@@ -213 +214 @@
-                                return false;
-
+                        $sql = "SELECT * FROM {$this->db->users} WHERE $sql_field = %s"; // ID is already (int)ed
-                        $user = $this->db->get_row( $this->db->prepare( $sql, $user_id ) );
+
+                        if ( 1 < $this->db->num_rows ) {
+                                if ( 'user_email' == $sql_field )
+                                        $err = __( 'Multiple email matches.  Log in with your username.' );
+                                else
+                                        $err = sprintf( __( 'Multiple %s matches' ), $sql_field );
+                                return new WP_Error( $sql_field, $err, $args + array( 'user_id' => $user_id, 'unique' => false ) );
+                        }
-
-                        if ( $user ) {