Changeset 25184

Timestamp:

08/30/2013 04:32:45 PM (11 years ago)

Author:

nacin

Message:

Revert [23307] so new users in multisite are not automatically subscribers on the main site.

Merges [25183] to the 3.6 branch.

props duck_.
fixes #25166.
see #15627.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-includes/ms-functions.php (modified) (1 diff)

branches/3.6/wp-includes/ms-functions.php

@@ -899 +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, $user->cap_key );
+    delete_user_option( $user_id, 'capabilities' );
     delete_user_option( $user_id, 'user_level' );