<!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][8665] trunk/src/bp-xprofile: xProfile: add extra arguments to `xprofile_data_value_before_save` and `xprofile_filtered_data_value_before_save` filters.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8665">8665</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-07-22 20:24:39 +0000 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xProfile: add extra arguments to `xprofile_data_value_before_save` and `xprofile_filtered_data_value_before_save` filters.
This allows plugin developers greater control over filtering profile data in specific circumstances, particularly for custom field types.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5742">#5742</a>, props needle.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofileclassesphp">trunk/src/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilefiltersphp">trunk/src/bp-xprofile/bp-xprofile-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-classes.php (8664 => 8665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-classes.php 2014-07-22 19:49:35 UTC (rev 8664)
+++ trunk/src/bp-xprofile/bp-xprofile-classes.php 2014-07-22 20:24:39 UTC (rev 8665)
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx">
</span><span class="cx"> $this->user_id = apply_filters( 'xprofile_data_user_id_before_save', $this->user_id, $this->id );
</span><span class="cx"> $this->field_id = apply_filters( 'xprofile_data_field_id_before_save', $this->field_id, $this->id );
</span><del>- $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id );
</del><ins>+ $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id, true, $this );
</ins><span class="cx"> $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', bp_core_current_time(), $this->id );
</span><span class="cx">
</span><span class="cx"> do_action_ref_array( 'xprofile_data_before_save', array( $this ) );
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-filters.php (8664 => 8665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-filters.php 2014-07-22 19:49:35 UTC (rev 8664)
+++ trunk/src/bp-xprofile/bp-xprofile-filters.php 2014-07-22 20:24:39 UTC (rev 8665)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> add_filter( 'xprofile_get_field_data', 'stripslashes' );
</span><span class="cx"> add_filter( 'xprofile_get_field_data', 'xprofile_filter_format_field_value_by_field_id', 5, 2 );
</span><span class="cx">
</span><del>-add_filter( 'xprofile_data_value_before_save', 'xprofile_sanitize_data_value_before_save', 1, 2 );
</del><ins>+add_filter( 'xprofile_data_value_before_save', 'xprofile_sanitize_data_value_before_save', 1, 4 );
</ins><span class="cx"> add_filter( 'xprofile_filtered_data_value_before_save', 'trim', 2 );
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -60,15 +60,16 @@
</span><span class="cx"> * Run profile field values through kses with filterable allowed tags.
</span><span class="cx"> *
</span><span class="cx"> * @param string $content
</span><ins>+ * @param object $data_obj The BP_XProfile_ProfileData object
</ins><span class="cx"> * @return string $content
</span><span class="cx"> */
</span><del>-function xprofile_filter_kses( $content ) {
</del><ins>+function xprofile_filter_kses( $content, $data_obj = null ) {
</ins><span class="cx"> global $allowedtags;
</span><span class="cx">
</span><span class="cx"> $xprofile_allowedtags = $allowedtags;
</span><span class="cx"> $xprofile_allowedtags['a']['rel'] = array();
</span><span class="cx">
</span><del>- $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags );
</del><ins>+ $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags, $data_obj );
</ins><span class="cx"> return wp_kses( $content, $xprofile_allowedtags );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,9 +79,10 @@
</span><span class="cx"> * @param string $field_value
</span><span class="cx"> * @param int $field_id
</span><span class="cx"> * @param bool $reserialize Whether to reserialize arrays before returning. Defaults to true
</span><ins>+ * @param object $data_obj The BP_XProfile_ProfileData object
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function xprofile_sanitize_data_value_before_save( $field_value, $field_id = 0, $reserialize = true ) {
</del><ins>+function xprofile_sanitize_data_value_before_save( $field_value, $field_id = 0, $reserialize = true, $data_obj = null ) {
</ins><span class="cx">
</span><span class="cx"> // Return if empty
</span><span class="cx"> if ( empty( $field_value ) ) {
</span><span class="lines">@@ -92,17 +94,17 @@
</span><span class="cx">
</span><span class="cx"> // Filter single value
</span><span class="cx"> if ( !is_array( $field_value ) ) {
</span><del>- $kses_field_value = xprofile_filter_kses( $field_value );
</del><ins>+ $kses_field_value = xprofile_filter_kses( $field_value, $data_obj );
</ins><span class="cx"> $filtered_field_value = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
</span><del>- $filtered_field_value = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_field_value, $field_value );
</del><ins>+ $filtered_field_value = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_field_value, $field_value, $data_obj );
</ins><span class="cx">
</span><span class="cx"> // Filter each array item independently
</span><span class="cx"> } else {
</span><span class="cx"> $filtered_values = array();
</span><span class="cx"> foreach ( (array) $field_value as $value ) {
</span><del>- $kses_field_value = xprofile_filter_kses( $value );
</del><ins>+ $kses_field_value = xprofile_filter_kses( $value, $data_obj );
</ins><span class="cx"> $filtered_value = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
</span><del>- $filtered_values[] = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_value, $value );
</del><ins>+ $filtered_values[] = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_value, $value, $data_obj );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>