Changeset 12799 for trunk/src/bp-members/bp-members-template.php

Timestamp:

11/19/2020 10:58:06 PM (6 years ago)

Author:

imath

Message:

Member Types: improve the newly introduced bp_member_type_list()

This is a followup to [12797] in order to make it possible to avoid showing the template tag's label.

See #8394

File:

• trunk/src/bp-members/bp-members-template.php (modified) (4 diffs)

trunk/src/bp-members/bp-members-template.php

@@ -2123 +2123 @@
                 );
 
+                // Should the label be output?
+                $has_label = ! empty( $r['label'] );
+
                 $labels = wp_parse_args(
                         $r['label'],
@@ -2143 +2146 @@
                         }
 
-                        $before = $after = '';
-                        $count = count( $types );
+                        $before = $after = $label = '';
+                        $count  = count( $types );
 
                         if ( 1 === $count ) {
@@ -2156 +2159 @@
                                 $parent_elem = new BP_Core_HTML_Element( array(
                                         'element' => $r['parent_element'],
-                                        'attr'    => $r['parent_attr']
+                                        'attr'    => $r['parent_attr'],
                                 ) );
 
@@ -2169 +2172 @@
                                         'element'    => $r['label_element'],
                                         'attr'       => $r['label_attr'],
-                                        'inner_html' => esc_html( $label_text )
+                                        'inner_html' => esc_html( $label_text ),
                                 ) );
                                 $label = $label->contents() . ' ';
 
                         // No element, just the label.
-                        } else {
+                        } elseif ( $has_label ) {
                                 $label = esc_html( $label_text );
                         }