Ticket #19127: 19127.diff

wp-includes/ms-functions.php

@@ -991 +991 @@
         add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
         update_option( 'blog_public', (int)$meta['public'] );
 
-        if ( !is_super_admin() && ! get_user_meta( $user_id, 'primary_blog', true ) )
-                update_user_meta( $user_id, 'primary_blog', $blog_id );
+        if ( ! is_super_admin( $user_id ) ) {
+                if ( ! get_user_meta( $user_id, 'primary_blog', true ) )
+                        update_user_meta( $user_id, 'primary_blog', $blog_id );
+                if ( ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
+                        update_user_meta( $user_id, 'show_welcome_panel', 1 );
+        }
 
         restore_current_blog();
         do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );

wp-admin/admin-ajax.php

@@ -1067 +1067 @@
         if ( ! current_user_can( 'edit_theme_options' ) )
                 die('-1');
 
-        if ( empty( $_POST['visible'] ) )
-                delete_user_option( get_current_user_id(), 'show_welcome_panel' );
-        else
-                update_user_option( get_current_user_id(), 'show_welcome_panel', 1 );
+        update_user_meta( get_current_user_id(), 'show_welcome_panel', empty( $_POST['visible'] ) ? 0 : 1 );
 
         die('1');
         break;

wp-admin/includes/upgrade.php

@@ -77 +77 @@
                 $message =  __('User already exists. Password inherited.');
         }
 
+        if ( $user_id )
+                update_user_meta( $user_id, 'show_welcome_panel', 1 );
+
         $user = new WP_User($user_id);
         $user->set_role('administrator');