Ticket #8410: 8410.diff

src/bp-core/classes/class-bp-admin-types.php

@@ -316 +316 @@
                 $taxonomy_object = get_taxonomy( $taxonomy );
                 $labels          = get_taxonomy_labels( $taxonomy_object );
 
+                // Gets the Type's metadata.
+                $metafields = get_registered_meta_keys( 'term', $taxonomy );
+
+                $this->display_meta_fields($metafields, $type, $labels, true);
+
                 // Default values for the Type ID field.
                 $type_id_label   = __( 'Type ID', 'buddypress' );
                 $type_id_desc    = __( 'Enter a lower-case string without spaces or special characters (used internally to identify the type).', 'buddypress' );
@@ -353 +358 @@
                         );
                 }
 
-                // Gets the Type's metadata.
-                $metafields = get_registered_meta_keys( 'term', $taxonomy );
+                $this->display_meta_fields($metafields, $type, $labels, false);
+        }
 
+        /**
+         * Output the additional BP type's meta fields
+         *
+         * @param string[]    $metafields List of registered meta keys.
+         * @param null|object $type       The type object, `null` if not passed to the method.
+         * @param object      $labels     Taxonomy labels object
+         * @param bool        $is_name    Is the meta field the singular/plurals name or another meta field ?
+         */
+        private function display_meta_fields($metafields, $type, $labels, $is_name){
                 foreach ( $metafields as $meta_key => $meta_schema ) {
                         if ( ! isset( $labels->{ $meta_key } ) || ! $labels->{ $meta_key } ) {
                                 _doing_it_wrong(
@@ -371 +385 @@
                         }
 
                         $type_key = str_replace( 'bp_type_', '', $meta_key );
+                        $is_name_meta_key = $is_name && ! in_array( $type_key, array( 'name', 'singular_name' ), true );
+                        $is_not_name_meta_key = ! $is_name && in_array( $type_key, array( 'name', 'singular_name' ), true ) ;
+
+                        if( $is_name_meta_key || $is_not_name_meta_key ) {
+                                continue;
+                        }
 
                         if ( 'string' === $meta_schema['type'] ) {
                                 if ( isset( $type->name ) ) {