<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4831] trunk: Fix profile field value handling of existing settings and new values when form submission fails validation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/4831">4831</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-07-24 13:17:12 +0000 (Sun, 24 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix profile field value handling of existing settings and new values when form submission fails validation. Props r-a-y for patch.
Change select box behaviour to not show "---" placeholder when field is required.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3378">#3378</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultforumsindexphp">trunk/bp-themes/bp-default/forums/index.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatephp">trunk/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/index.php (4830 => 4831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/index.php 2011-07-24 12:42:41 UTC (rev 4830)
+++ trunk/bp-themes/bp-default/forums/index.php 2011-07-24 13:17:12 UTC (rev 4831)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> <label><?php _e( 'Post In Group Forum:', 'buddypress' ); ?></label>
</span><span class="cx"> <select id="topic_group_id" name="topic_group_id">
</span><span class="cx">
</span><del>- <option value="">----</option>
</del><ins>+ <option value=""><?php /* translators: no option picked in select box */ _e( '----', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php while ( bp_groups() ) : bp_the_group(); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (4830 => 4831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2011-07-24 12:42:41 UTC (rev 4830)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2011-07-24 13:17:12 UTC (rev 4831)
</span><span class="lines">@@ -325,9 +325,14 @@
</span><span class="cx"> * Check to see if the posted value is different, if it is re-display this
</span><span class="cx"> * value as long as it's not empty and a required field.
</span><span class="cx"> */
</span><del>- if ( isset( $_POST['field_' . $field->id] ) && isset( $field->data->value ) && $field->data->value != $_POST['field_' . $field->id] ) {
</del><ins>+ if ( !isset( $field->data->value ) )
+ $field->data->value = '';
+
+ if ( isset( $_POST['field_' . $field->id] ) && $field->data->value != $_POST['field_' . $field->id] ) {
</ins><span class="cx"> if ( !empty( $_POST['field_' . $field->id] ) )
</span><span class="cx"> $field->data->value = $_POST['field_' . $field->id];
</span><ins>+ else
+ $field->data->value = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $field_value = isset( $field->data->value ) ? bp_unserialize_profile_field( $field->data->value ) : '';
</span><span class="lines">@@ -416,15 +421,19 @@
</span><span class="cx"> $selected = '';
</span><span class="cx">
</span><span class="cx"> switch ( $field->type ) {
</span><ins>+ case 'selectbox':
+ if ( !$field->is_required )
+ $html .= '<option value="">' . /* translators: no option picked in select box */ __( '----', 'buddypress' ) . '</option>';
</ins><span class="cx">
</span><del>- case 'selectbox': case 'multiselectbox':
- if ( 'multiselectbox' != $field->type )
- $html .= '<option value="">--------</option>';
</del><ins>+ $original_option_values = '';
+ $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
</ins><span class="cx">
</span><del>- $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
</del><ins>+ if ( empty( $original_option_values ) && !empty( $_POST['field_' . $field->id] ) )
+ $original_option_values = $_POST['field_' . $field->id];
+
</ins><span class="cx"> $option_values = (array) $original_option_values;
</span><span class="cx">
</span><del>- for ( $k = 0; $k < count( $options ); $k++ ) {
</del><ins>+ for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
</ins><span class="cx"> // Check for updated posted values, but errors preventing them from being saved first time
</span><span class="cx"> foreach( $option_values as $i => $option_value ) {
</span><span class="cx"> if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) {
</span><span class="lines">@@ -432,32 +441,62 @@
</span><span class="cx"> $option_values[$i] = $_POST['field_' . $field->id];
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> $selected = '';
</span><span class="cx">
</span><del>- // Run the allowed option name through the before_save
- // filter, so we'll be sure to get a match
</del><ins>+ // Run the allowed option name through the before_save filter, so we'll be sure to get a match
</ins><span class="cx"> $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
</span><span class="cx">
</span><del>- // First, check to see whether the user-entered value
- // matches
</del><ins>+ // First, check to see whether the user-entered value matches
</ins><span class="cx"> if ( in_array( $allowed_options, (array) $option_values ) )
</span><span class="cx"> $selected = ' selected="selected"';
</span><span class="cx">
</span><del>- // Then, if the user has not provided a value, check for
- // defaults
- if ( !is_array( $original_option_values ) && empty( $option_values ) & $options[$k]->is_default_option )
</del><ins>+ // Then, if the user has not provided a value, check for defaults
+ if ( !is_array( $original_option_values ) && empty( $option_values ) && $options[$k]->is_default_option )
</ins><span class="cx"> $selected = ' selected="selected"';
</span><span class="cx">
</span><span class="cx"> $html .= apply_filters( 'bp_get_the_profile_field_options_select', '<option' . $selected . ' value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '">' . esc_attr( stripslashes( $options[$k]->name ) ) . '</option>', $options[$k] );
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case 'multiselectbox':
+ $original_option_values = '';
+ $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
+
+ if ( empty( $original_option_values ) && !empty( $_POST['field_' . $field->id] ) )
+ $original_option_values = $_POST['field_' . $field->id];
+
+ $option_values = (array) $original_option_values;
+
+ for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
+ // Check for updated posted values, but errors preventing them from being saved first time
+ foreach( $option_values as $i => $option_value ) {
+ if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id][$i] != $option_value ) {
+ if ( !empty( $_POST['field_' . $field->id][$i] ) )
+ $option_values[] = $_POST['field_' . $field->id][$i];
+ }
+ }
+ $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
+ if ( in_array( $allowed_options, (array) $option_values ) )
+ $selected = ' selected="selected"';
+
+ // Then, if the user has not provided a value, check for defaults
+ if ( !is_array( $original_option_values ) && empty( $option_values ) && $options[$k]->is_default_option )
+ $selected = ' selected="selected"';
+
+ $html .= apply_filters( 'bp_get_the_profile_field_options_multiselect', '<option' . $selected . ' value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '">' . esc_attr( stripslashes( $options[$k]->name ) ) . '</option>', $options[$k] );
+ }
+ break;
+
</ins><span class="cx"> case 'radio':
</span><span class="cx"> $html .= '<div id="field_' . $field->id . '">';
</span><span class="cx"> $option_value = BP_XProfile_ProfileData::get_value_byid( $field->id );
</span><span class="cx">
</span><del>- for ( $k = 0; $k < count( $options ); $k++ ) {
</del><ins>+ for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
</ins><span class="cx"> // Check for updated posted values, but errors preventing them from being saved first time
</span><span class="cx"> if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) {
</span><span class="cx"> if ( !empty( $_POST['field_' . $field->id] ) )
</span><span class="lines">@@ -488,16 +527,15 @@
</span><span class="cx"> $option_values = $_POST['field_' . $field->id];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for ( $k = 0; $k < count( $options ); $k++ ) {
</del><ins>+ for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
</ins><span class="cx"> $selected = '';
</span><span class="cx">
</span><span class="cx"> // First, check to see whether the user's saved values
</span><span class="cx"> // match the option
</span><del>- for ( $j = 0; $j < count( $option_values ); $j++ ) {
</del><ins>+ for ( $j = 0, $count = count( $option_values ); $j < $count; ++$j ) {
</ins><span class="cx">
</span><span class="cx"> // Run the allowed option name through the
</span><del>- // before_save filter, so we'll be sure to get a
- // match
</del><ins>+ // before_save filter, so we'll be sure to get a match
</ins><span class="cx"> $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
</span><span class="cx">
</span><span class="cx"> if ( $option_values[$j] == $allowed_options || @in_array( $allowed_options, $value ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>