Ticket #2203: 2203.002.diff

bp-friends.php

@@ -317 +317 @@
         $friendship->friend_user_id = $friend_userid;
         $friendship->is_confirmed = 0;
         $friendship->is_limited = 0;
-        $friendship->date_created = time();
+        $friendship->date_created = gmdate( "Y-m-d H:i:s" );
 
         if ( $force_accept )
                 $friendship->is_confirmed = 1;

bp-core/bp-core-notifications.php

@@ -4 +4 @@
         global $bp;
 
         if ( !$date_notified )
-                $date_notified = time();
+                $date_notified = gmdate( "Y-m-d H:i:s" );
 
         $notification = new BP_Core_Notification;
         $notification->item_id = $item_id;

bp-core/bp-core-classes.php

@@ -421 +421 @@
 
                 if ( $this->id ) {
                         // Update
-                        $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
+                        $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = %s, is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
                 } else {
                         // Save
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, %s, %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
                 }
 
                 if ( !$result = $wpdb->query( $sql ) )

bp-friends/bp-friends-classes.php

@@ -60 +60 @@
 
                 if ( $this->id ) {
                         // Update
-                        $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = FROM_UNIXTIME(%d) ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
+                        $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET initiator_user_id = %d, friend_user_id = %d, is_confirmed = %d, is_limited = %d, date_created = %s ) WHERE id = %d", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created, $this->id ) );
                 } else {
                         // Save
-                        $result = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->friends->table_name} ( initiator_user_id, friend_user_id, is_confirmed, is_limited, date_created ) VALUES ( %d, %d, %d, %d, FROM_UNIXTIME(%d) )", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created ) );
+                        $result = $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->friends->table_name} ( initiator_user_id, friend_user_id, is_confirmed, is_limited, date_created ) VALUES ( %d, %d, %d, %d, %s )", $this->initiator_user_id, $this->friend_user_id, $this->is_confirmed, $this->is_limited, $this->date_created ) );
                         $this->id = $wpdb->insert_id;
                 }
 
@@ -201 +201 @@
         function accept($friendship_id) {
                 global $wpdb, $bp;
 
-                return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = FROM_UNIXTIME(%d) WHERE id = %d AND friend_user_id = %d", time(), $friendship_id, $bp->loggedin_user->id ) );
+                return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", gmdate( "Y-m-d H:i:s" ), $friendship_id, $bp->loggedin_user->id ) );
         }
 
         function reject($friendship_id) {

bp-messages.php

@@ -327 +327 @@
                 'recipients' => false, // Can be an array of usernames, user_ids or mixed.
                 'subject' => false,
                 'content' => false,
-                'date_sent' => time()
+                'date_sent' => gmdate( "Y-m-d H:i:s" )
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -412 +412 @@
                 $notice = new BP_Messages_Notice;
                 $notice->subject = $subject;
                 $notice->message = $message;
-                $notice->date_sent = time();
+                $notice->date_sent = gmdate( "Y-m-d H:i:s" );
                 $notice->is_active = 1;
                 $notice->save(); // send it.
 

bp-messages/bp-messages-templatetags.php

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

bp-messages/bp-messages-classes.php

@@ -243 +243 @@
         function bp_messages_message( $id = null ) {
                 global $bp;
 
-                $this->date_sent = time();
+                $this->date_sent = gmdate( "Y-m-d H:i:s" );
                 $this->sender_id = $bp->loggedin_user->id;
 
                 if ( $id ) {
@@ -288 +288 @@
                 }
 
                 // First insert the message into the messages table
-                if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, FROM_UNIXTIME(%d) )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
+                if ( !$wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_messages} ( thread_id, sender_id, subject, message, date_sent ) VALUES ( %d, %d, %s, %s, %s )", $this->thread_id, $this->sender_id, $this->subject, $this->message, $this->date_sent ) ) )
                         return false;
 
                 if ( $new_thread ) {
@@ -387 +387 @@
                 do_action( 'messages_notice_before_save', $this );
 
                 if ( !$this->id ) {
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, FROM_UNIXTIME(%d), %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_notices} (subject, message, date_sent, is_active) VALUES (%s, %s, %s, %d)", $this->subject, $this->message, $this->date_sent, $this->is_active );
                 } else {
                         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET subject = %s, message = %s, is_active = %d WHERE id = %d", $this->subject, $this->message, $this->is_active, $this->id );
                 }