Add user to blog 1 when creating user from wpmu-users.php

Set primary_blog to 1 if not set and add user to blog 1 if user doesn't have a blog.
Fixes #427


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1152 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 20 insertions, 19 deletions

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 743ea00..b2a6a09 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -153,28 +153,29 @@ uksort($menu, "strnatcasecmp"); // make it all pretty
 if (! user_can_access_admin_page()) {
 	// find the blog of this user first
 	$primary_blog = (int) get_usermeta( $user_ID, 'primary_blog' );
-	if( $primary_blog != 0 ) {
-		global $wpdb;
-		$newblog = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$primary_blog}'" );
-		if( $newblog != null ) {
-			$blogs = get_blogs_of_user( $user_ID );
-			if ( empty($blogs) || $blogs == false ) { // If user haven't any blog
-				update_usermeta( $user_ID, 'wp_1_capabilities', array('subscriber' => true)); // Add subscriber permission for first blog.
-				wp_redirect( 'http://' . $current_site->domain . $current_site->path. 'wp-admin/' );
-				exit();
-			}
+	if( !$primary_blog )
+		$primary_blog = 1;
+
+	global $wpdb;
+	$newblog = $wpdb->get_row( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = '{$primary_blog}'" );
+	if( $newblog != null ) {
+		$blogs = get_blogs_of_user( $user_ID );
+		if ( empty($blogs) || $blogs == false ) { // If user haven't any blog
+			add_user_to_blog('1', $user_ID, 'subscriber'); // Add subscriber permission for first blog.
+			wp_redirect( 'http://' . $current_site->domain . $current_site->path. 'wp-admin/' );
+			exit();
+		}
 
-			foreach ( (array) $blogs as $blog ) {
-				if ( $blog->userblog_id == $newblog->blog_id ) {
-					wp_redirect( 'http://' . $newblog->domain . $newblog->path . 'wp-admin/' );
-					exit();
-				}
+		foreach ( (array) $blogs as $blog ) {
+			if ( $blog->userblog_id == $newblog->blog_id ) {
+				wp_redirect( 'http://' . $newblog->domain . $newblog->path . 'wp-admin/' );
+				exit();
 			}
-			
-			$blog = $blogs[0]; // Take the first blog...
-			wp_redirect( 'http://' . $blog->domain . $blog->path. 'wp-admin/' );
-			exit();
 		}
+
+		$blog = $blogs[0]; // Take the first blog...
+		wp_redirect( 'http://' . $blog->domain . $blog->path. 'wp-admin/' );
+		exit();
 	}
 	wp_die( __('You do not have sufficient permissions to access this page.') );
 }