Ticket #6751: 6751.02.patch

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

@@ -104 +104 @@
         public function edit_field_options_html( array $args = array() ) {
                 $options       = $this->field_obj->get_children();
                 $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] ) );
+
+                /*
+                 * Determine whether to pre-select the default option.
+                 *
+                 * If there's no saved value, take the following into account:
+                 * If the user has never saved a value for this field,
+                 * $option_values will be an empty string, and we should pre-select the default option.
+                 * If the user has specifically chosen none of the options,
+                 * $option_values will be an empty array, and we should respect that value.
+                 */
+                $select_default_option = false;
+                if ( empty( $option_values ) && ! is_array( $option_values ) ) {
+                        $select_default_option = true;
+                }
+
                 $option_values = ( $option_values ) ? (array) $option_values : array();
 
                 $html = '';
@@ -134 +149 @@
 
                         // If the user has not yet supplied a value for this field, check to
                         // see whether there is a default value available.
-                        if ( empty( $option_values ) && empty( $selected ) && ! empty( $options[$k]->is_default_option ) ) {
+                        if ( empty( $selected ) && $select_default_option && ! empty( $options[$k]->is_default_option ) ) {
                                 $selected = ' checked="checked"';
                         }