Changeset 4431

Timestamp:

05/28/2011 06:01:48 PM (14 years ago)

Author:

djpaul

Message:

Don't do multiple queries when editing xprofile select/radio/checkboxes. Fixes #3233, props sbrajesh

File:

• trunk/bp-xprofile/bp-xprofile-template.php (modified) (7 diffs)

trunk/bp-xprofile/bp-xprofile-template.php

@@ -419 +419 @@
                     $html .= '<option value="">--------</option>';
 
-                for ( $k = 0; $k < count($options); $k++ ) {
-                    $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) );
-                    $option_values = (array) $original_option_values;
-
+                $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
+                $option_values = (array) $original_option_values;
+
+                for ( $k = 0; $k < count( $options ); $k++ ) {
                     // Check for updated posted values, but errors preventing them from being saved first time
                     foreach( $option_values as $i => $option_value ) {
@@ -432 +432 @@
 
                     $selected = '';
-                    
+
                     // Run the allowed option name through the before_save
                     // filter, so we'll be sure to get a match
                     $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
-                    
+
                     // First, check to see whether the user-entered value
                     // matches
@@ -453 +453 @@
             case 'radio':
                 $html .= '<div id="field_' . $field->id . '">';
-
-                for ( $k = 0; $k < count($options); $k++ ) {
-                    $option_value = BP_XProfile_ProfileData::get_value_byid($options[$k]->parent_id);
-
+                $option_value = BP_XProfile_ProfileData::get_value_byid( $field->id );
+
+                for ( $k = 0; $k < count( $options ); $k++ ) {
                     // 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] ) {
@@ -462 +461 @@
                             $option_value = $_POST['field_' . $field->id];
                     }
-                    
+
                     // Run the allowed option name through the before_save
                     // filter, so we'll be sure to get a match
                     $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
-                    
-                    $selected = ''; 
+
+                    $selected = '';
                     if ( $option_value == $allowed_options || !empty( $value ) && $value == $allowed_options || ( empty( $option_value ) && $options[$k]->is_default_option ) )
                         $selected = ' checked="checked"';
@@ -478 +477 @@
 
             case 'checkbox':
-                $option_values = BP_XProfile_ProfileData::get_value_byid($options[0]->parent_id);
+                $option_values = BP_XProfile_ProfileData::get_value_byid( $field->id );
+                $option_values = maybe_unserialize( $option_values );
 
                 // Check for updated posted values, but errors preventing them from being saved first time
@@ -486 +486 @@
                 }
 
-                $option_values = maybe_unserialize($option_values);
-                
-                for ( $k = 0; $k < count($options); $k++ ) {
+                for ( $k = 0; $k < count( $options ); $k++ ) {
                     $selected = '';
-                    
+
                     // First, check to see whether the user's saved values
                     // match the option
-                    for ( $j = 0; $j < count($option_values); $j++ ) {
-                        
+                    for ( $j = 0; $j < count( $option_values ); $j++ ) {
+
                         // Run the allowed option name through the
                         // before_save filter, so we'll be sure to get a
                         // match
                         $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
-                        
+
                         if ( $option_values[$j] == $allowed_options || @in_array( $allowed_options, $value ) ) {
                             $selected = ' checked="checked"';
@@ -505 +503 @@
                         }
                     }
-                    
+
                     // If the user has not yet supplied a value for this field,
                     // check to see whether there is a default value available