Changeset 2416

Timestamp:

01/24/2010 01:13:15 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1641

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-blogs.php (modified) (5 diffs)
• bp-core.php (modified) (2 diffs)
• bp-friends.php (modified) (2 diffs)
• bp-groups.php (modified) (2 diffs)
• bp-xprofile.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -1 +1 @@
 <?php
 
-define ( 'BP_ACTIVITY_DB_VERSION', '2031' );
+define ( 'BP_ACTIVITY_DB_VERSION', '2040' );
 
 /* Define the slug for the component */
@@ -469 +469 @@
         'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id
         'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id
-        'recorded_time' => time(), // The time that this activity was recorded
+        'recorded_time' => gmdate( "Y-m-d H:i:s" ), // The GMT time that this activity was recorded
         'hide_sitewide' => false // Should this be hidden on the sitewide activity stream?
     );

trunk/bp-activity/bp-activity-classes.php

@@ -56 +56 @@
         /* If we have an existing ID, update the activity item, otherwise insert it. */
         if ( $this->id )
-            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = FROM_UNIXTIME(%d), item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
+            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
         else
-            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, %s, FROM_UNIXTIME(%d), %s, %s, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide );
+            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide ) VALUES ( %d, %s, %s, %s, %s, %s, %s, %s, %s, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide );
 
         if ( !$wpdb->query( $q ) )

trunk/bp-activity/bp-activity-templatetags.php

@@ -530 +530 @@
     $content = urldecode($content);
 
-    return apply_filters( 'bp_activity_insert_time_since', @sprintf( $content, @sprintf( __( '  %s ago', 'buddypress' ), bp_core_time_since( strtotime( $date ) ) ) ) );
+    return apply_filters( 'bp_activity_insert_time_since', @sprintf( $content, @sprintf( __( '  %s ago', 'buddypress' ), bp_core_time_since( $date ) ) ) );
 }
 

trunk/bp-blogs.php

@@ -253 +253 @@
         'item_id' => false,
         'secondary_item_id' => false,
-        'recorded_time' => time(),
         'hide_sitewide' => false
     );
@@ -279 +278 @@
     ) );
 
-    return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'hide_sitewide' => $hide_sitewide ) );
 }
 
@@ -420 +419 @@
                     'item_id' => $blog_id,
                     'secondary_item_id' => $post_id,
-                    'recorded_time' => strtotime( $post->post_date_gmt )
+                    'recorded_time' => $post->post_date_gmt
                 ));
             }
@@ -455 +454 @@
                 'item_id' => $blog_id,
                 'secondary_item_id' => $post_id,
-                'recorded_time' => strtotime( $post->post_date_gmt )
+                'recorded_time' => $post->post_date_gmt
             ) );
         }
@@ -513 +512 @@
             'item_id' => $wpdb->blogid,
             'secondary_item_id' => $comment_id,
-            'recorded_time' => strtotime( $comment->comment_date_gmt )
+            'recorded_time' => $comment->comment_date_gmt
         ) );
     }

trunk/bp-core.php

@@ -1357 +1357 @@
     );
 
-    $older_date = strtotime( gmdate( 'Y-m-d H:i:s', $older_date ) );
+    if ( !is_numeric( $older_date ) )
+        $older_date = strtotime( $older_date . ' GMT' );
 
     /* $newer_date will equal false if we want to know the time elapsed between a date and the current time */
     /* $newer_date will have a value if we want to work out time elapsed between two known dates */
-    $newer_date = ( !$newer_date ) ? ( strtotime( gmdate( 'Y-m-d H:i:s' ) ) + ( 60*60*0 ) ) : $newer_date;
+    $newer_date = ( !$newer_date ) ? gmmktime() : $newer_date;
 
     /* Difference in seconds */
@@ -1393 +1394 @@
         $seconds2 = $chunks[$i + 1][0];
         $name2 = $chunks[$i + 1][1];
-
-        //if ( $chunks[$i + 1][1] == __( 'second', 'buddypress' ) ) return $output;
 
         if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {

trunk/bp-friends.php

@@ -276 +276 @@
         'item_id' => false,
         'secondary_item_id' => false,
-        'recorded_time' => time(),
         'hide_sitewide' => false
     );
@@ -283 +282 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'hide_sitewide' => $hide_sitewide ) );
 }
 

trunk/bp-groups.php

@@ -1326 +1326 @@
         'item_id' => false,
         'secondary_item_id' => false,
-        'recorded_time' => time(),
         'hide_sitewide' => $hide_sitewide
     );
@@ -1333 +1332 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'hide_sitewide' => $hide_sitewide ) );
 }
 

trunk/bp-xprofile.php

@@ -490 +490 @@
         'item_id' => false,
         'secondary_item_id' => false,
-        'recorded_time' => time(),
         'hide_sitewide' => false
     );
@@ -497 +496 @@
     extract( $r, EXTR_SKIP );
 
-    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'hide_sitewide' => $hide_sitewide ) );
 }