<!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][4362] trunk/bp-xprofile: Applies pre-save filters to permitted xprofile options before comparing with submitted values, to account for special characters.</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>4362</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-05-15 17:23:50 +0000 (Sun, 15 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Applies pre-save filters to permitted xprofile options before comparing with submitted values, to account for special characters. Fixes #3213</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofilefiltersphp">trunk/bp-xprofile/bp-xprofile-filters.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="trunkbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-filters.php (4361 => 4362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-filters.php 2011-05-15 15:30:05 UTC (rev 4361)
+++ trunk/bp-xprofile/bp-xprofile-filters.php 2011-05-15 17:23:50 UTC (rev 4362)
</span><span class="lines">@@ -66,9 +66,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $field_value
</span><span class="cx"> * @param int $field_id
</span><ins>+ * @param bool $reserialize Whether to reserialize arrays before returning. Defaults to true
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function xprofile_sanitize_data_value_before_save ( $field_value, $field_id ) {
</del><ins>+function xprofile_sanitize_data_value_before_save ( $field_value, $field_id, $reserialize = true ) {
</ins><span class="cx">
</span><span class="cx"> // Return if empty
</span><span class="cx"> if ( empty( $field_value ) )
</span><span class="lines">@@ -93,7 +94,10 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $filtered_field_value = serialize( $filtered_values );
</del><ins>+ if ( $reserialize )
+ $filtered_field_value = serialize( $filtered_values );
+ else
+ $filtered_field_value = $filtered_values;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $filtered_field_value;
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (4361 => 4362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2011-05-15 15:30:05 UTC (rev 4361)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2011-05-15 17:23:50 UTC (rev 4362)
</span><span class="lines">@@ -432,9 +432,13 @@
</span><span class="cx">
</span><span class="cx"> $selected = '';
</span><span class="cx">
</span><ins>+ // 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 );
+
</ins><span class="cx"> // First, check to see whether the user-entered value
</span><span class="cx"> // matches
</span><del>- if ( in_array( $options[$k]->name, (array) $option_values ) )
</del><ins>+ if ( in_array( $allowed_options, (array) $option_values ) )
</ins><span class="cx"> $selected = ' selected="selected"';
</span><span class="cx">
</span><span class="cx"> // Then, if the user has not provided a value, check for
</span><span class="lines">@@ -458,8 +462,12 @@
</span><span class="cx"> $option_value = $_POST['field_' . $field->id];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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 );
+
</ins><span class="cx"> $selected = '';
</span><del>- if ( $option_value == $options[$k]->name || !empty( $value ) && $value == $options[$k]->name || ( empty( $option_value ) && $options[$k]->is_default_option ) )
</del><ins>+ if ( $option_value == $allowed_options || !empty( $value ) && $value == $allowed_options || ( empty( $option_value ) && $options[$k]->is_default_option ) )
</ins><span class="cx"> $selected = ' checked="checked"';
</span><span class="cx">
</span><span class="cx"> $html .= apply_filters( 'bp_get_the_profile_field_options_radio', '<label><input' . $selected . ' type="radio" name="field_' . $field->id . '" id="option_' . $options[$k]->id . '" value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '"> ' . esc_attr( stripslashes( $options[$k]->name ) ) . '</label>', $options[$k] );
</span><span class="lines">@@ -485,7 +493,13 @@
</span><span class="cx"> // First, check to see whether the user's saved values
</span><span class="cx"> // match the option
</span><span class="cx"> for ( $j = 0; $j < count($option_values); $j++ ) {
</span><del>- if ( $option_values[$j] == $options[$k]->name || @in_array( $options[$k]->name, $value ) ) {
</del><ins>+
+ // 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 ) ) {
</ins><span class="cx"> $selected = ' checked="checked"';
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>