Changeset 33115

Timestamp:

07/07/2015 07:28:46 PM (9 years ago)

Author:

wonderboymusic

Message:

In wp_insert_user(), comparing an email address against the user's old email address should not be case-sensitive.

Adds unit tests.

Props tyxla.
Fixes #32158.

Location:

trunk

Files:

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

trunk/src/wp-includes/user.php

@@ -1946 +1946 @@
      * accordingly.
      */
-    if ( ( ! $update || ( ! empty( $old_user_data ) && $user_email !== $old_user_data->user_email ) )
+    if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) )
         && ! defined( 'WP_IMPORTING' )
         && email_exists( $user_email )

trunk/tests/phpunit/tests/user.php

@@ -757 +757 @@
         $this->assertTrue( in_array( $id, $users ) );
     }
+
+    /**
+     * @ticket 32158
+     */
+    function test_email_case() {
+        // Create a test user with a lower-case email address.
+        $user_id = $this->factory->user->create( array(
+            'user_email' => 'test@test.com',
+        ) );
+
+        // Alter the case of the email address (which stays the same).
+        $userdata = array(
+            'ID' => $user_id,
+            'user_email' => 'test@TEST.com',
+        );
+        $update = wp_update_user( $userdata );
+
+        $this->assertEquals( $user_id, $update );
+    }
+
+    /**
+     * @ticket 32158
+     */
+    function test_email_change() {
+        // Create a test user.
+        $user_id = $this->factory->user->create( array(
+            'user_email' => 'test@test.com',
+        ) );
+
+        // Change the email address.
+        $userdata = array(
+            'ID' => $user_id,
+            'user_email' => 'test2@test.com',
+        );
+        $update = wp_update_user( $userdata );
+
+        // Was this successful?
+        $this->assertEquals( $user_id, $update );
+
+        // Verify that the email address has been updated.
+        $user = get_userdata( $user_id );
+        $this->assertEquals( $user->user_email, 'test2@test.com' );
+    }
+
 }