Changeset 3147

Timestamp:

07/22/2010 11:46:37 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Adjust bp_format_time to properly format date/time string.

File:

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

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

@@ -853 +853 @@
     $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 );
+    if ( !$just_date ) {
+        // Current time (9:50pm)
+        $time = date( ' g:ia', $time_offest );
+
+        // Return string formatted with date and time
+        $date = sprintf( __( '%1$s at %2$s', 'buddypress' ), $date, $time );
+    }
 
     return apply_filters( 'bp_format_time', $date );