Ticket #7083: 7083.03.patch

src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php

@@ -176 +176 @@
                         $html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', $new_html, $options[$k], $this->field_obj->id, $selected, $k );
                 }
 
-                echo $html;
+                printf( '<div id="%1$s" class="input-options checkbox-options">%2$s</div>',
+                        esc_attr( 'field_' . $this->field_obj->id ),
+                        $html
+                );
         }
 
         /**

src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php

@@ -111 +111 @@
                 $option_value = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
                 $options      = $this->field_obj->get_children();
 
-                $html = sprintf( '<div id="%s">', esc_attr( 'field_' . $this->field_obj->id ) );
+                $html = '';
 
                 for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
 
@@ -154 +154 @@
                         $html .= apply_filters( 'bp_get_the_profile_field_options_radio', $new_html, $options[$k], $this->field_obj->id, $selected, $k );
                 }
 
-                echo $html . '</div>';
+                printf( '<div id="%1$s" class="input-options radio-button-options">%2$s</div>',
+                        esc_attr( 'field_' . $this->field_obj->id ),
+                        $html
+                );
         }
 
         /**