Changeset 2831

Timestamp:

03/11/2010 11:41:31 AM (15 years ago)

Author:

apeatling

Message:

Fixes #2173

Location:

branches/1.2

Files:

• bp-themes/bp-default/_inc/css/default.css (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)
• bp-themes/bp-default/members/single/profile/edit.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (2 diffs)

branches/1.2/bp-themes/bp-default/_inc/css/default.css

@@ -803 +803 @@
         }
 
+    form.standard-form a.clear-value {
+        display: block;
+        margin-top: 5px;
+        outline: none;
+    }
+
 form.standard-form #basic-details-section, form.standard-form #blog-details-section,
 form.standard-form #profile-details-section {

branches/1.2/bp-themes/bp-default/_inc/global.js

@@ -1226 +1226 @@
     var container = document.getElementById(container);
 
-    radioButtons = container.getElementsByTagName('INPUT');
-
-    for(var i=0; i<radioButtons.length; i++) {
-        radioButtons[i].checked = '';
+    if ( radioButtons = container.getElementsByTagName('INPUT') ) {
+        for(var i=0; i<radioButtons.length; i++) {
+            radioButtons[i].checked = '';
+        }
+    }
+
+    if ( options = container.getElementsByTagName('OPTION') ) {
+        for(var i=0; i<options.length; i++) {
+            options[i].selected = false;
+        }
     }
 

branches/1.2/bp-themes/bp-default/members/single/profile/edit.php

@@ -48 +48 @@
                         <?php bp_the_profile_field_options() ?>
                     </select>
+
+                    <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
+                        <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+                    <?php endif; ?>
 
                 <?php endif; ?>

branches/1.2/bp-xprofile.php

@@ -336 +336 @@
             }
 
-            do_action( 'xprofile_updated_profile', $posted_field_ids, $errors );
+            do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
 
             /* Set the feedback messages */

branches/1.2/bp-xprofile/bp-xprofile-templatetags.php

@@ -345 +345 @@
         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 );
     }
 
@@ -373 +377 @@
 
                 for ( $k = 0; $k < count($options); $k++ ) {
-                    $option_value = BP_XProfile_ProfileData::get_value_byid($options[$k]->parent_id);
+                    $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 {