<!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][8631] trunk/src/bp-xprofile/bp-xprofile-screens.php: xProfile: when updating a user profile, make sure the actions are passed the field's current (new) value.</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/8631">8631</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-07-16 09:53:18 +0000 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xProfile: when updating a user profile, make sure the actions are passed the field's current (new) value.
Previously, we've been passing these actions the values that we've told xProfile to set, instead of the
field's actual (new) value. Most of the time, these will be identical, but with BP 2.0's xProfile field
type improvements, there are more lower-level places where the value could be filtered before the data's
written to the database.
In this situation, the field's actual new value could be different from what we've been returning in the
`xprofile_profile_field_data_updated` and `xprofile_updated_profile` actions.
See <a href="http://buddypress.trac.wordpress.org/ticket/5755">#5755</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofilescreensphp">trunk/src/bp-xprofile/bp-xprofile-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofilescreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-screens.php (8630 => 8631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-screens.php 2014-07-16 09:17:54 UTC (rev 8630)
+++ trunk/src/bp-xprofile/bp-xprofile-screens.php 2014-07-16 09:53:18 UTC (rev 8631)
</span><span class="lines">@@ -117,19 +117,22 @@
</span><span class="cx"> 'value' => xprofile_get_field_data( $field_id, bp_displayed_user_id() ),
</span><span class="cx"> 'visibility' => xprofile_get_field_visibility_level( $field_id, bp_displayed_user_id() ),
</span><span class="cx"> );
</span><ins>+
+ // Update the field data and visibility level
+ xprofile_set_field_visibility_level( $field_id, bp_displayed_user_id(), $visibility_level );
+ $field_updated = xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[ $field_id ] );
+ $value = xprofile_get_field_data( $field_id, bp_displayed_user_id() );
+
</ins><span class="cx"> $new_values[ $field_id ] = array(
</span><span class="cx"> 'value' => $value,
</span><del>- 'visibility' => $visibility_level,
</del><ins>+ 'visibility' => xprofile_get_field_visibility_level( $field_id, bp_displayed_user_id() ),
</ins><span class="cx"> );
</span><span class="cx">
</span><del>- if ( !xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[$field_id] ) ) {
</del><ins>+ if ( ! $field_updated ) {
</ins><span class="cx"> $errors = true;
</span><span class="cx"> } else {
</span><span class="cx"> do_action( 'xprofile_profile_field_data_updated', $field_id, $value );
</span><span class="cx"> }
</span><del>-
- // Save the visibility level
- xprofile_set_field_visibility_level( $field_id, bp_displayed_user_id(), $visibility_level );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'xprofile_updated_profile', bp_displayed_user_id(), $posted_field_ids, $errors, $old_values, $new_values );
</span></span></pre>
</div>
</div>
</body>
</html>