Changeset 5948

Timestamp:

03/29/2012 01:17:22 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes problems is bp_get_the_profile_field_options():

• In 'checkbox' case, cast existing values as an array, to avoid misunderstandings with count() and in_array() later in the function
• In 'checkbox' case, replace call to non-existent 'value' variable to something that makes sense in context
• Clears up PHP warnings, and allows for better maintenance of existing values when switching between xprofile field types.

Fixes #4102

File:

• branches/1.5/bp-xprofile/bp-xprofile-template.php (modified) (2 diffs)

branches/1.5/bp-xprofile/bp-xprofile-template.php

@@ -526 +526 @@
             case 'checkbox':
                 $option_values = BP_XProfile_ProfileData::get_value_byid( $field->id );
-                $option_values = maybe_unserialize( $option_values );
+                $option_values = (array) maybe_unserialize( $option_values );
 
                 // Check for updated posted values, but errors preventing them from being saved first time
@@ -545 +545 @@
                         $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
 
-                        if ( $option_values[$j] == $allowed_options || @in_array( $allowed_options, $value ) ) {
+                        if ( $option_values[$j] == $allowed_options || @in_array( $allowed_options, $option_values ) ) {
                             $selected = ' checked="checked"';
                             break;