Changeset 2784 for trunk/bp-xprofile.php

Timestamp:

02/23/2010 08:55:18 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.2 branch into the trunk

File:

• trunk/bp-xprofile.php (modified) (1 diff)

trunk/bp-xprofile.php

@@ -725 +725 @@
                 return false;
 
+        $field = new BP_XProfile_Field( $field_id );
+
+        /* Check the value is an acceptable value */
+        if ( 'checkbox' == $field->type || 'radio' == $field->type || 'selectbox' == $field->type || 'multiselectbox' == $field->type ) {
+                $options = $field->get_children();
+
+                foreach( $options as $option )
+                        $possible_values[] = $option->name;
+
+                if ( is_array( $value ) ) {
+                        foreach( $value as $i => $single ) {
+                                if ( !in_array( $single, (array)$possible_values ) )
+                                        unset( $value[$i] );
+                        }
+
+                        if ( empty( $value ) )
+                                return false;
+
+                        /* Reset the keys by merging with an empty array */
+                        $value = array_merge( array(), $value );
+                } else {
+                        if ( !in_array( $value, (array)$possible_values ) )
+                                return false;
+                }
+        }
+
         $field = new BP_XProfile_ProfileData();
         $field->field_id = $field_id;