Changeset 5131

Timestamp:

09/09/2011 05:47:59 PM (13 years ago)

Author:

boonebgorges

Message:

Switches date picker xprofile fields to save in MySQL date format rather than UNIX timestamp, to prevent problems with UNIX epoch. Fixes #2240. Props cnorris23, r-a-y

Location:

trunk

Files:

• bp-members/bp-members-signup.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-template.php (modified) (1 diff)

trunk/bp-members/bp-members-signup.php

@@ -77 +77 @@
                     if ( !isset( $_POST['field_' . $field_id] ) ) {
                         if ( isset( $_POST['field_' . $field_id . '_day'] ) )
-                            $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
+                            $_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'] ) );
                     }
 
@@ -128 +128 @@
                     if ( !isset( $_POST['field_' . $field_id] ) ) {
                         if ( isset( $_POST['field_' . $field_id . '_day'] ) )
-                            $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
+                            $_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'] ) );
                     }
 

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -110 +110 @@
 }
 
+/**
+ * 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.
+ */
 function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
     if ( !isset( $field_value ) || empty( $field_value ) )
         return false;
 
-    if ( 'datebox' == $field_type )
-        $field_value = bp_format_time( $field_value, true, false );
-    else
+    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 {
         $field_value = str_replace(']]>', ']]>', $field_value );
+    }
 
     return stripslashes( $field_value );

trunk/bp-xprofile/bp-xprofile-screens.php

@@ -71 +71 @@
 
                     // Turn the concatenated value into a timestamp
-                    $_POST['field_' . $field_id] = strtotime( $date_value );
+                    $_POST['field_' . $field_id] = date( 'Y-m-d H:i:s', strtotime( $date_value ) );
                 }
 

trunk/bp-xprofile/bp-xprofile-template.php

@@ -570 +570 @@
 
                 if ( !empty( $date ) ) {
-                    $day   = date( 'j', $date );
-                    $month = date( 'F', $date );
-                    $year  = date( 'Y', $date );
+                    // 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 );
+                    }
                 }