Ticket #2203: omgpizza.patch

bp-core/bp-core-templatetags.php

@@ -820 +820 @@
         $root_blog_offset = get_blog_option( BP_ROOT_BLOG, 'gmt_offset' );
 
         // Calculate offset time
-        $time_offest = $time + ( $root_blog_offset * 3600 );
+        $time_offset = $time + ( $root_blog_offset * 3600 );
 
         // Current date (January 1, 2010)
-        $date = date( 'F j, Y ', $time_offest );
+        $date = date( 'F j, Y ', $time_offset );
 
         // Should we show the time also?
         if ( !$just_date ) {
                 // Current time (9:50pm)
-                $time = date( ' g:ia', $time_offest );
+                $time = date( ' g:ia', $time_offset );
 
                 // Return string formatted with date and time
                 $date = sprintf( __( '%1$s at %2$s', 'buddypress' ), $date, $time );

bp-messages/bp-messages-templatetags.php

@@ -291 +291 @@
         function bp_get_message_thread_last_post_date() {
                 global $messages_template;
 
-                return apply_filters( 'bp_get_message_thread_last_post_date', bp_format_time( get_date_from_gmt( $messages_template->thread->last_message_date, 'U' ) ) );
+                return apply_filters( 'bp_get_message_thread_last_post_date', bp_format_time( strtotime( $messages_template->thread->last_message_date ) ) );
         }
 
 function bp_message_thread_avatar() {