Changes from branches/3.6/wp-includes/ms-functions.php at r25198 to trunk/wp-includes/ms-functions.php at r24155

File:

• trunk/wp-includes/ms-functions.php (modified) (3 diffs)

trunk/wp-includes/ms-functions.php

@@ -379 +379 @@
 
     if ( $banned_names && is_array( $banned_names ) ) {
-        $banned_names = array_map( 'strtolower', $banned_names );
-        $normalized_email = strtolower( $user_email );
-
-        list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
+        list( $email_local_part, $email_domain ) = explode( '@', $user_email );
 
         foreach ( $banned_names as $banned_domain ) {
@@ -394 +391 @@
 
             $dotted_domain = ".$banned_domain";
-            if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
+            if ( $dotted_domain === substr( $user_email, -strlen( $dotted_domain ) ) ) {
                 $is_email_address_unsafe = true;
                 break;
@@ -902 +899 @@
         return false;
 
+    $user = new WP_User( $user_id );
+
     // Newly created users have no roles or caps until they are added to a blog.
-    delete_user_option( $user_id, 'capabilities' );
+    delete_user_option( $user_id, $user->cap_key );
     delete_user_option( $user_id, 'user_level' );