<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2645] trunk/bp-xprofile.php: Fixes #1865</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2645</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-10 15:24:26 +0000 (Wed, 10 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1865</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2644 => 2645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-02-10 15:15:48 UTC (rev 2644)
+++ trunk/bp-xprofile.php 2010-02-10 15:24:26 UTC (rev 2645)
</span><span class="lines">@@ -298,6 +298,8 @@
</span><span class="cx"> /* Explode the posted field IDs into an array so we know which fields have been submitted */
</span><span class="cx"> $posted_field_ids = explode( ',', $_POST['field_ids'] );
</span><span class="cx">
</span><ins>+ $is_required = array();
+
</ins><span class="cx"> /* Loop through the posted fields formatting any datebox values then validate the field */
</span><span class="cx"> foreach ( (array)$posted_field_ids as $field_id ) {
</span><span class="cx"> if ( !isset( $_POST['field_' . $field_id] ) ) {
</span><span class="lines">@@ -314,7 +316,8 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
</del><ins>+ $is_required[$field_id] = xprofile_check_is_required_field( $field_id );
+ if ( $is_required[$field_id] && empty( $_POST['field_' . $field_id] ) )
</ins><span class="cx"> $errors = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -326,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> /* Now we've checked for required fields, lets save the values. */
</span><span class="cx"> foreach ( (array)$posted_field_ids as $field_id ) {
</span><del>- if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id] ) )
</del><ins>+ if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id], $is_required[$field_id] ) )
</ins><span class="cx"> $errors = true;
</span><span class="cx"> else
</span><span class="cx"> do_action( 'xprofile_profile_field_data_updated', $field_id, $_POST['field_' . $field_id] );
</span><span class="lines">@@ -709,7 +712,7 @@
</span><span class="cx"> * @uses xprofile_get_field_id_from_name() Gets the ID for the field based on the name.
</span><span class="cx"> * @return true on success, false on failure.
</span><span class="cx"> */
</span><del>-function xprofile_set_field_data( $field, $user_id, $value ) {
</del><ins>+function xprofile_set_field_data( $field, $user_id, $value, $is_required = false ) {
</ins><span class="cx"> if ( is_numeric( $field ) )
</span><span class="cx"> $field_id = $field;
</span><span class="cx"> else
</span><span class="lines">@@ -718,7 +721,7 @@
</span><span class="cx"> if ( !$field_id )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( empty( $value ) || !strlen( trim( $value ) ) )
</del><ins>+ if ( $is_required && ( empty( $value ) || !strlen( trim( $value ) ) ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $field = new BP_XProfile_ProfileData();
</span></span></pre>
</div>
</div>
</body>
</html>