Changeset 2842 for trunk/bp-xprofile/bp-xprofile-templatetags.php

Timestamp:

03/12/2010 01:03:42 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

• trunk/bp-xprofile/bp-xprofile-templatetags.php (modified) (3 diffs)

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -343 +343 @@
                 global $field;
 
-                return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id );
+                $array_box = false;
+                if ( 'multiselectbox' == $field->type )
+                        $array_box = '[]';
+
+                return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id . $array_box );
         }
 
@@ -370 +374 @@
                                         $html .= '<option value="">--------</option>';
 
-                                for ( $k = 0; $k < count( $options ); $k++ ) {
-                                        $option_value = BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id );
+                                for ( $k = 0; $k < count($options); $k++ ) {
+                                        $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) );
+                                        $option_values = (array)$option_values;
 
                                         /* Check for updated posted values, but errors preventing them from being saved first time */
-                                        if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) {
-                                                if ( !empty( $_POST['field_' . $field->id] ) )
-                                                        $option_value = $_POST['field_' . $field->id];
+                                        foreach( (array)$option_values as $i => $option_value ) {
+                                                if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) {
+                                                        if ( !empty( $_POST['field_' . $field->id] ) )
+                                                                $option_values[$i] = $_POST['field_' . $field->id];
+                                                }
                                         }
 
-                                        if ( $option_value == $options[$k]->name || $options[$k]->is_default_option )
+                                        if ( in_array( $options[$k]->name, (array)$option_values ) || $options[$k]->is_default_option )
                                                 $selected = ' selected="selected"';
                                         else
@@ -649 +656 @@
 
                 /* admin/profile/edit/[group-id] */
-                return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id ); 
+                return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id );
         }