Ticket #6125: bp-members-functions.patch

src/bp-members/bp-members-functions.php

@@ -2479 +2479 @@
                 'labels' => array(),
         ), 'register_member_type' );
 
-        $type = (object) $r;
-
         // Store the post type name as data in the object (not just as the array key).
-        $type->name = $member_type;
+        $r['name'] = $member_type;
 
         // Make sure the relevant labels have been filled in.
-        $default_name = isset( $r['labels']['name'] ) ? $r['labels']['name'] : ucfirst( $type->name );
+        $default_name = isset( $r['labels']['name'] ) ? $r['labels']['name'] : ucfirst( $r['name'] );
         $r['labels'] = array_merge( array(
                 'name'          => $default_name,
                 'singular_name' => $default_name,
         ), $r['labels'] );
 
-        $bp->members->types[ $member_type ] = $type;
+        $bp->members->types[ $member_type ] = $type = (object) $r;
 
         /**
          * Fires after a member type is registered.
@@ -2517 +2515 @@
 function bp_get_member_type_object( $member_type ) {
         $types = bp_get_member_types( array(), 'objects' );
 
-        if ( empty( $types[ $member_type ] ) ) {
+        if ( ! isset( $types[ $member_type ] ) ) {
                 return null;
         }
 
@@ -2543 +2541 @@
 function bp_get_member_types( $args = array(), $output = 'names', $operator = 'and' ) {
         $types = buddypress()->members->types;
 
-        $field = 'names' == $output ? 'name' : false;
-
         $types = wp_filter_object_list( $types, $args, $operator );
 
         /**