Changeset 29966

Timestamp:

10/19/2014 08:29:33 PM (10 years ago)

Author:

boonebgorges

Message:

Allow apostrophes in email addresses when adding users via the Dashboard.

Email addresses entered in a number of interfaces were not being stripslashed
properly, with the result that the emails were not being recognized as valid.

Fixes #18039.

Location:

trunk/src/wp-admin

Files:

• includes/user.php (modified) (1 diff)
• network/user-new.php (modified) (2 diffs)
• user-new.php (modified) (3 diffs)

trunk/src/wp-admin/includes/user.php

@@ -64 +64 @@
 
     if ( isset( $_POST['email'] ))
-        $user->user_email = sanitize_text_field( $_POST['email'] );
+        $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
     if ( isset( $_POST['url'] ) ) {
         if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {

trunk/src/wp-admin/network/user-new.php

@@ -39 +39 @@
         wp_die( __( 'Cannot create an empty user.' ) );
 
-    $user = $_POST['user'];
+    $user = wp_unslash( $_POST['user'] );
 
     $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
@@ -46 +46 @@
     } else {
         $password = wp_generate_password( 12, false);
-        $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+        $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
 
         if ( ! $user_id ) {

trunk/src/wp-admin/user-new.php

@@ -42 +42 @@
 
     $user_details = null;
-    if ( false !== strpos($_REQUEST[ 'email' ], '@') ) {
-        $user_details = get_user_by('email', $_REQUEST[ 'email' ]);
+    $user_email = wp_unslash( $_REQUEST['email'] );
+    if ( false !== strpos( $user_email, '@' ) ) {
+        $user_details = get_user_by( 'email', $user_email );
     } else {
         if ( is_super_admin() ) {
-            $user_details = get_user_by('login', $_REQUEST[ 'email' ]);
+            $user_details = get_user_by( 'login', $user_email );
         } else {
             wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
@@ -113 +114 @@
     } else {
         // Adding a new user to this site
-        $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
+        $new_user_email = wp_unslash( $_REQUEST['email'] );
+        $user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
         if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
             $add_user_errors = $user_details[ 'errors' ];
@@ -129 +131 @@
                 add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
             }
-            wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
+            wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) );
             if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
-                $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
+                $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
                 wpmu_activate_signup( $key );
                 $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );