Changeset 3651

Timestamp:

01/04/2011 12:42:42 PM (14 years ago)

Author:

boonebgorges

Message:

Reworks the display of datebox xprofile filters so that dates are not offset according to local time. Cleans up bp_format_time(). Fixes 2779. Props cnorris23.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-filters.php (modified) (1 diff)

trunk/bp-core/bp-core-templatetags.php

@@ -834 +834 @@
 }
 
-function bp_format_time( $time, $just_date = false ) {
-    if ( !$time )
+function bp_format_time( $time, $just_date = false, $localize_time = true ) {
+    if ( !isset( $time ) || !is_numeric( $time ) )
         return false;
 
     // Get GMT offset from root blog
-    $root_blog_offset = get_blog_option( BP_ROOT_BLOG, 'gmt_offset' );
+    $root_blog_offset = false;
+    if ( $localize_time )
+        $root_blog_offset = get_blog_option( BP_ROOT_BLOG, 'gmt_offset' );
 
     // Calculate offset time
@@ -850 +852 @@
     if ( !$just_date ) {
         // Current time (9:50pm)
-        $time = date_i18n( ' g:ia', $time_offset );
+        $time = date_i18n( get_option( 'time_format' ), $time_offset );
 
         // Return string formatted with date and time

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

@@ -102 +102 @@
 
     if ( 'datebox' == $field_type )
-        $field_value = bp_format_time( $field_value, true );
+        $field_value = bp_format_time( $field_value, true, false );
     else
         $field_value = str_replace(']]>', ']]>', $field_value );