Changeset 9521 for trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php

Timestamp:

02/21/2015 02:27:49 PM (10 years ago)

Author:

djpaul

Message:

xprofile: fix broken selection of default values for checkboxes, select boxes, and multi-select boxes.

When we try to fetch a user's profile field value from the database, if it wasn't set, then we return an empty string.
A few profile field types were mishandling an empty string response from BP_XProfile_ProfileData::get_value_byid, and it was being mistakenly interpreted as a user selected value.

This change checks the return value from BP_XProfile_ProfileData::get_value_byid, and if it's empty, instead of always casting the value, sets the ongoing variable to an empty array instead.

Fixes #6134

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php (modified) (2 diffs)

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

@@ -102 +102 @@
     public function edit_field_options_html( array $args = array() ) {
         $options       = $this->field_obj->get_children();
-        $option_values = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
-        $option_values = (array) maybe_unserialize( $option_values );
+        $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] ) );
+        $option_values = ( $option_values ) ? (array) $option_values : array();
 
         $html = '';
@@ -133 +133 @@
             // If the user has not yet supplied a value for this field, check to
             // see whether there is a default value available
-            if ( ! is_array( $option_values ) && empty( $option_values ) && empty( $selected ) && ! empty( $options[$k]->is_default_option ) ) {
+            if ( empty( $option_values ) && empty( $selected ) && ! empty( $options[$k]->is_default_option ) ) {
                 $selected = ' checked="checked"';
             }