<!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][5131] trunk: Switches date picker xprofile fields to save in MySQL date format rather than UNIX timestamp, to prevent problems with UNIX epoch.</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><a href="http://buddypress.trac.wordpress.org/changeset/5131">5131</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-09-09 17:47:59 +0000 (Fri, 09 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switches date picker xprofile fields to save in MySQL date format rather than UNIX timestamp, to prevent problems with UNIX epoch. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/2240">#2240</a>. Props cnorris23, r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmemberssignupphp">trunk/bp-members/bp-members-signup.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefiltersphp">trunk/bp-xprofile/bp-xprofile-filters.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilescreensphp">trunk/bp-xprofile/bp-xprofile-screens.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="trunkbpmembersbpmemberssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-signup.php (5130 => 5131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-signup.php 2011-09-09 15:31:03 UTC (rev 5130)
+++ trunk/bp-members/bp-members-signup.php 2011-09-09 17:47:59 UTC (rev 5131)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> foreach ( (array) $profile_field_ids as $field_id ) {
</span><span class="cx"> if ( !isset( $_POST['field_' . $field_id] ) ) {
</span><span class="cx"> if ( isset( $_POST['field_' . $field_id . '_day'] ) )
</span><del>- $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
</del><ins>+ $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Create errors for required fields without values
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> foreach ( (array) $profile_field_ids as $field_id ) {
</span><span class="cx"> if ( !isset( $_POST['field_' . $field_id] ) ) {
</span><span class="cx"> if ( isset( $_POST['field_' . $field_id . '_day'] ) )
</span><del>- $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
</del><ins>+ $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $_POST['field_' . $field_id] ) )
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-filters.php (5130 => 5131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-filters.php 2011-09-09 15:31:03 UTC (rev 5130)
+++ trunk/bp-xprofile/bp-xprofile-filters.php 2011-09-09 17:47:59 UTC (rev 5131)
</span><span class="lines">@@ -109,14 +109,38 @@
</span><span class="cx"> return $filtered_field_value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * xprofile_filter_format_field_value()
+ *
+ * Runs stripslashes on XProfile fields. If is field_type is 'datebox'
+ * then the date will be formatted by bp_format_time().
+ *
+ * @since 1.0.0
+ *
+ * @param string $field_value XProfile field_value to be filtered.
+ * @param string $field_type XProfile field_type to be filtered.
+ *
+ * @uses bp_format_time()
+ *
+ * @return string $field_value Filtered XProfile field_value. False on failure.
+ */
</ins><span class="cx"> function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
</span><span class="cx"> if ( !isset( $field_value ) || empty( $field_value ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( 'datebox' == $field_type )
- $field_value = bp_format_time( $field_value, true, false );
- else
</del><ins>+ if ( 'datebox' == $field_type ) {
+
+ // If Unix timestamp
+ if ( is_numeric( $field_value ) )
+ $field_value = bp_format_time( $field_value, true, false );
+
+ // If MySQL timestamp
+ else
+ $field_value = bp_format_time( strtotime( $field_value ), true, false );
+
+ } else {
</ins><span class="cx"> $field_value = str_replace(']]>', ']]&gt;', $field_value );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return stripslashes( $field_value );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilescreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-screens.php (5130 => 5131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-screens.php 2011-09-09 15:31:03 UTC (rev 5130)
+++ trunk/bp-xprofile/bp-xprofile-screens.php 2011-09-09 17:47:59 UTC (rev 5131)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> $date_value = $_POST['field_' . $field_id . '_day'] . ' ' . $_POST['field_' . $field_id . '_month'] . ' ' . $_POST['field_' . $field_id . '_year'];
</span><span class="cx">
</span><span class="cx"> // Turn the concatenated value into a timestamp
</span><del>- $_POST['field_' . $field_id] = strtotime( $date_value );
</del><ins>+ $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $date_value ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (5130 => 5131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2011-09-09 15:31:03 UTC (rev 5130)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2011-09-09 17:47:59 UTC (rev 5131)
</span><span class="lines">@@ -569,9 +569,18 @@
</span><span class="cx"> $year = '';
</span><span class="cx">
</span><span class="cx"> if ( !empty( $date ) ) {
</span><del>- $day = date( 'j', $date );
- $month = date( 'F', $date );
- $year = date( 'Y', $date );
</del><ins>+ // If Unix timestamp
+ if ( is_numeric( $date ) ) {
+ $day = date( 'j', $date );
+ $month = date( 'F', $date );
+ $year = date( 'Y', $date );
+
+ // If MySQL timestamp
+ } else {
+ $day = mysql2date( 'j', $date );
+ $month = mysql2date( 'F', $date );
+ $year = mysql2date( 'Y', $date );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Check for updated posted values, but errors preventing them from being saved first time
</span></span></pre>
</div>
</div>
</body>
</html>