<!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][8653] branches/2.0/bp-xprofile/bp-xprofile-classes.php: xProfile: fix datebox field validation.</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/8653">8653</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-07-20 20:10:31 +0000 (Sun, 20 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xProfile: fix datebox field validation.
If a validation error occurred when saving a profile field(s), the datebox field type wasn?\226?\128?\153t restoring the user-submitted value after the screen was reloaded. This was a regression introduced in BuddyPress 2.0 with the Profile Field Types rewrite.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5690">#5690</a> (branch), props esroyo for initial patch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches20bpxprofilebpxprofileclassesphp">branches/2.0/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches20bpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: branches/2.0/bp-xprofile/bp-xprofile-classes.php (8652 => 8653)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.0/bp-xprofile/bp-xprofile-classes.php 2014-07-20 20:05:05 UTC (rev 8652)
+++ branches/2.0/bp-xprofile/bp-xprofile-classes.php 2014-07-20 20:10:31 UTC (rev 8653)
</span><span class="lines">@@ -1547,8 +1547,9 @@
</span><span class="cx"> * @since BuddyPress (2.0.0)
</span><span class="cx"> */
</span><span class="cx"> public function edit_field_options_html( array $args = array() ) {
</span><del>- $options = $this->field_obj->get_children();
- $date = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
</del><ins>+ $options = $this->field_obj->get_children();
+ $date = BP_XProfile_ProfileData::get_value_byid( $this->field_obj->id, $args['user_id'] );
+ $eng_months = array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
</ins><span class="cx">
</span><span class="cx"> $day = 0;
</span><span class="cx"> $month = 0;
</span><span class="lines">@@ -1579,12 +1580,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_POST['field_' . $this->field_obj->id . '_month'] ) ) {
</span><del>- $new_month = (int) $_POST['field_' . $this->field_obj->id . '_month'];
- $month = ( $month != $new_month ) ? $new_month : $month;
</del><ins>+ if ( in_array( $_POST['field_' . $this->field_obj->id . '_month'], $eng_months ) ) {
+ $new_month = $_POST['field_' . $this->field_obj->id . '_month'];
+ } else {
+ $new_month = $month;
+ }
+
+ $month = ( $month !== $new_month ) ? $new_month : $month;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_POST['field_' . $this->field_obj->id . '_year'] ) ) {
</span><del>- $new_year = date( 'j', (int) $_POST['field_' . $this->field_obj->id . '_year'] );
</del><ins>+ $new_year = (int) $_POST['field_' . $this->field_obj->id . '_year'];
</ins><span class="cx"> $year = ( $year != $new_year ) ? $new_year : $year;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1599,8 +1605,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'month':
</span><del>- $eng_months = array( 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' );
-
</del><span class="cx"> $months = array(
</span><span class="cx"> __( 'January', 'buddypress' ),
</span><span class="cx"> __( 'February', 'buddypress' ),
</span></span></pre>
</div>
</div>
</body>
</html>