Ticket #2223: 2223.patch

includes/admin/users.php

@@ -47 +47 @@
                         return;
 
                 // User profile edit/display actions
-                add_action( 'edit_user_profile', array( $this, 'secondary_role_display' ) );
+                add_action( 'edit_user_profile',    array( $this, 'secondary_role_display' ) );
+                add_action( 'user_new_form_after',  array( $this, 'secondary_role_display' ) );
 
                 // WordPress user screen
                 add_action( 'restrict_manage_users',      array( $this, 'user_role_bulk_dropdown' )        );
@@ -66 +67 @@
          * @param WP_User $profileuser User data
          * @return bool Always false
          */
-        public static function secondary_role_display( $profileuser ) {
+        public static function secondary_role_display( $profileuser = null ) {
 
                 // Bail if current user cannot edit users
-                if ( ! current_user_can( 'edit_user', $profileuser->ID ) )
+                if ( ! empty( $profileuser ) && ! current_user_can( 'edit_user', $profileuser->ID ) )
                         return;
 
                 // Get the roles
@@ -87 +88 @@
                                         <th><label for="bbp-forums-role"><?php esc_html_e( 'Forum Role', 'bbpress' ); ?></label></th>
                                         <td>
 
-                                                <?php $user_role = bbp_get_user_role( $profileuser->ID ); ?>
+                                                <?php $user_role = ! empty( $profileuser ) ? bbp_get_user_role( $profileuser->ID ) : null; ?>
 
                                                 <select name="bbp-forums-role" id="bbp-forums-role">
 

includes/core/actions.php

@@ -51 +51 @@
 add_action( 'template_redirect',        'bbp_template_redirect',        8     ); // Before BuddyPress's 10 [BB2225]
 add_action( 'login_form_login',         'bbp_login_form_login',         10    );
 add_action( 'profile_update',           'bbp_profile_update',           10, 2 ); // user_id and old_user_data
+add_action( 'user_register',            'bbp_profile_update',           10, 1 ); // user_id
 add_action( 'user_register',            'bbp_user_register',            10    );
 
 /**