Ticket #24992: 24992.2.patch

src/wp-admin/includes/user.php

@@ -195 +195 @@
  * @since 2.0.5
  *
  * @param int $user_id User ID.
- * @return object WP_User object with user data.
+ * @return WP_User|bool WP_User object on success, false on failure.
  */
 function get_user_to_edit( $user_id ) {
         $user = get_userdata( $user_id );
 
-        $user->filter = 'edit';
+        if ( $user )
+                $user->filter = 'edit';
 
         return $user;
 }

src/wp-includes/pluggable.php

@@ -115 +115 @@
  * @since 0.71
  *
  * @param int $user_id User ID
- * @return bool|object False on failure, WP_User object on success
+ * @return WP_User|bool WP_User object on success, false on failure.
  */
 function get_userdata( $user_id ) {
         return get_user_by( 'id', $user_id );
@@ -130 +130 @@
  *
  * @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
+ * @return WP_User|bool WP_User object on success, false on failure.
  */
 function get_user_by( $field, $value ) {
         $userdata = WP_User::get_data_by( $field, $value );
@@ -463 +463 @@
  *
  * @param string $username User's username
  * @param string $password User's password
- * @return WP_Error|WP_User WP_User object if login successful, otherwise WP_Error object.
+ * @return WP_User|WP_Error WP_User object if login successful, otherwise WP_Error object.
  */
 function wp_authenticate($username, $password) {
         $username = sanitize_user($username);