<!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][4431] trunk/bp-xprofile/bp-xprofile-template.php: Don't do multiple queries when editing xprofile select/radio/checkboxes.</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>4431</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-05-28 18:01:48 +0000 (Sat, 28 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't do multiple queries when editing xprofile select/radio/checkboxes. Fixes #3233, props sbrajesh</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofiletemplatephp">trunk/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (4430 => 4431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2011-05-27 18:32:15 UTC (rev 4430)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2011-05-28 18:01:48 UTC (rev 4431)
</span><span class="lines">@@ -418,10 +418,10 @@
</span><span class="cx"> if ( 'multiselectbox' != $field->type )
</span><span class="cx"> $html .= '<option value="">--------</option>';
</span><span class="cx">
</span><del>- 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;
</del><ins>+ $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
+ $option_values = (array) $original_option_values;
</ins><span class="cx">
</span><ins>+ for ( $k = 0; $k < count( $options ); $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">@@ -431,11 +431,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $selected = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Run the allowed option name through the before_save
</span><span class="cx"> // filter, so we'll be sure to get a match
</span><span class="cx"> $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
</span><del>-
</del><ins>+
</ins><span class="cx"> // First, check to see whether the user-entered value
</span><span class="cx"> // matches
</span><span class="cx"> if ( in_array( $allowed_options, (array) $option_values ) )
</span><span class="lines">@@ -452,21 +452,20 @@
</span><span class="cx">
</span><span class="cx"> case 'radio':
</span><span class="cx"> $html .= '<div id="field_' . $field->id . '">';
</span><ins>+ $option_value = BP_XProfile_ProfileData::get_value_byid( $field->id );
</ins><span class="cx">
</span><del>- for ( $k = 0; $k < count($options); $k++ ) {
- $option_value = BP_XProfile_ProfileData::get_value_byid($options[$k]->parent_id);
-
</del><ins>+ for ( $k = 0; $k < count( $options ); $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="cx"> $option_value = $_POST['field_' . $field->id];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Run the allowed option name through the before_save
</span><span class="cx"> // filter, so we'll be sure to get a match
</span><span class="cx"> $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
</span><del>-
- $selected = '';
</del><ins>+
+ $selected = '';
</ins><span class="cx"> if ( $option_value == $allowed_options || !empty( $value ) && $value == $allowed_options || ( empty( $option_value ) && $options[$k]->is_default_option ) )
</span><span class="cx"> $selected = ' checked="checked"';
</span><span class="cx">
</span><span class="lines">@@ -477,7 +476,8 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'checkbox':
</span><del>- $option_values = BP_XProfile_ProfileData::get_value_byid($options[0]->parent_id);
</del><ins>+ $option_values = BP_XProfile_ProfileData::get_value_byid( $field->id );
+ $option_values = maybe_unserialize( $option_values );
</ins><span class="cx">
</span><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_values != maybe_serialize( $_POST['field_' . $field->id] ) ) {
</span><span class="lines">@@ -485,26 +485,24 @@
</span><span class="cx"> $option_values = $_POST['field_' . $field->id];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $option_values = maybe_unserialize($option_values);
-
- for ( $k = 0; $k < count($options); $k++ ) {
</del><ins>+ for ( $k = 0; $k < count( $options ); $k++ ) {
</ins><span class="cx"> $selected = '';
</span><del>-
</del><ins>+
</ins><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; $j < count( $option_values ); $j++ ) {
+
</ins><span class="cx"> // Run the allowed option name through the
</span><span class="cx"> // before_save filter, so we'll be sure to get a
</span><span class="cx"> // match
</span><span class="cx"> $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $option_values[$j] == $allowed_options || @in_array( $allowed_options, $value ) ) {
</span><span class="cx"> $selected = ' checked="checked"';
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // If the user has not yet supplied a value for this field,
</span><span class="cx"> // check to see whether there is a default value available
</span><span class="cx"> if ( !is_array( $option_values ) && empty( $option_values ) && !$selected && $options[$k]->is_default_option) {
</span></span></pre>
</div>
</div>
</body>
</html>