Changeset 49036

Timestamp:

09/23/2020 12:25:47 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Users: Check if the user ID passed as selected to wp_dropdown_users() corresponds to an existing user.

This avoids a few PHP notices if the include_selected parameter was specified and a non-existing user ID was passed.

Props campusboy1987.
Fixes #51370.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/user/wpDropdownUsers.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -1192 +1192 @@
             $found_selected          = false;
             $parsed_args['selected'] = (int) $parsed_args['selected'];
+
             foreach ( (array) $users as $user ) {
                 $user->ID = (int) $user->ID;
@@ -1200 +1201 @@
 
             if ( ! $found_selected ) {
-                $users[] = get_userdata( $parsed_args['selected'] );
+                $selected_user = get_userdata( $parsed_args['selected'] );
+                if ( $selected_user ) {
+                    $users[] = $selected_user;
+                }
             }
         }

trunk/tests/phpunit/tests/user/wpDropdownUsers.php

@@ -131 +131 @@
 
     /**
+     * @ticket 51370
+     */
+    public function test_include_selected_with_non_existing_user_id() {
+        $found = wp_dropdown_users(
+            array(
+                'echo'             => false,
+                'selected'         => PHP_INT_MAX,
+                'include_selected' => true,
+                'show'             => 'user_login',
+            )
+        );
+
+        $this->assertNotContains( (string) PHP_INT_MAX, $found );
+    }
+
+    /**
      * @ticket 38135
      */