Changeset 3142 for branches/1.2/bp-core/bp-core-templatetags.php

Timestamp:

07/21/2010 07:33:39 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2203 and #2497. Introduces bp_core_current_time function as central handler for all time related functions. Removes unused bp_core_format_time in lieu of currently used bp_format_time.

File:

• branches/1.2/bp-core/bp-core-templatetags.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-templatetags.php

@@ -841 +841 @@
 
 function bp_format_time( $time, $just_date = false ) {
-        $date = date( get_option('date_format'), $time );
-
-        if ( !$just_date ) {
-                $date .= ' ' . __( 'at', 'buddypress' ) . date( ' ' . get_option('time_format'), $time );
-        }
+        if ( !$time )
+                return false;
+
+        // Get GMT offset from root blog
+        $root_blog_offset = get_blog_option( BP_ROOT_BLOG, 'gmt_offset' );
+
+        // Calculate offset time
+        $time_offest = $time + ( $root_blog_offset * 3600 );
+
+        // Current date (January 1, 2010)
+        $date = date( 'F j, Y ', $time_offest );
+
+        // Current time (9:50pm)
+        $time = date( ' g:ia', $time_offest );
+
+        // Should we show the time also?
+        if ( !$just_date )
+                $date .= __( 'at', 'buddypress' ) . date( ' g:iA', $time_offest );
 
         return apply_filters( 'bp_format_time', $date );