<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2416] trunk: Fixes #1641</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2416</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-24 13:13:15 +0000 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1641</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-activity/bp-activity-classes.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> /* If we have an existing ID, update the activity item, otherwise insert it. */
</span><span class="cx"> if ( $this->id )
</span><del>- $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 );
</del><ins>+ $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 );
</ins><span class="cx"> else
</span><del>- $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 );
</del><ins>+ $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 );
</ins><span class="cx">
</span><span class="cx"> if ( !$wpdb->query( $q ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> // Make sure we don't have any URL encoding in links when trying to insert the time.
</span><span class="cx"> $content = urldecode($content);
</span><span class="cx">
</span><del>- return apply_filters( 'bp_activity_insert_time_since', @sprintf( $content, @sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( strtotime( $date ) ) ) ) );
</del><ins>+ return apply_filters( 'bp_activity_insert_time_since', @sprintf( $content, @sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $date ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_permalink_id() {
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-activity.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-define ( 'BP_ACTIVITY_DB_VERSION', '2031' );
</del><ins>+define ( 'BP_ACTIVITY_DB_VERSION', '2040' );
</ins><span class="cx">
</span><span class="cx"> /* Define the slug for the component */
</span><span class="cx"> if ( !defined( 'BP_ACTIVITY_SLUG' ) )
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> 'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
</span><span class="cx"> 'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id
</span><span class="cx"> 'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id
</span><del>- 'recorded_time' => time(), // The time that this activity was recorded
</del><ins>+ 'recorded_time' => gmdate( "Y-m-d H:i:s" ), // The GMT time that this activity was recorded
</ins><span class="cx"> 'hide_sitewide' => false // Should this be hidden on the sitewide activity stream?
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-blogs.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -252,7 +252,6 @@
</span><span class="cx"> 'type' => false,
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'secondary_item_id' => false,
</span><del>- 'recorded_time' => time(),
</del><span class="cx"> 'hide_sitewide' => false
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -278,7 +277,7 @@
</span><span class="cx"> 'secondary_item_id' => $secondary_item_id
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- 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 ) );
</del><ins>+ 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 ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blogs_delete_activity( $args = true ) {
</span><span class="lines">@@ -419,7 +418,7 @@
</span><span class="cx"> 'type' => 'new_blog_post',
</span><span class="cx"> 'item_id' => $blog_id,
</span><span class="cx"> 'secondary_item_id' => $post_id,
</span><del>- 'recorded_time' => strtotime( $post->post_date_gmt )
</del><ins>+ 'recorded_time' => $post->post_date_gmt
</ins><span class="cx"> ));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -454,7 +453,7 @@
</span><span class="cx"> 'type' => 'new_blog_post',
</span><span class="cx"> 'item_id' => $blog_id,
</span><span class="cx"> 'secondary_item_id' => $post_id,
</span><del>- 'recorded_time' => strtotime( $post->post_date_gmt )
</del><ins>+ 'recorded_time' => $post->post_date_gmt
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -512,7 +511,7 @@
</span><span class="cx"> 'type' => 'new_blog_comment',
</span><span class="cx"> 'item_id' => $wpdb->blogid,
</span><span class="cx"> 'secondary_item_id' => $comment_id,
</span><del>- 'recorded_time' => strtotime( $comment->comment_date_gmt )
</del><ins>+ 'recorded_time' => $comment->comment_date_gmt
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-core.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -1356,11 +1356,12 @@
</span><span class="cx"> array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $older_date = strtotime( gmdate( 'Y-m-d H:i:s', $older_date ) );
</del><ins>+ if ( !is_numeric( $older_date ) )
+ $older_date = strtotime( $older_date . ' GMT' );
</ins><span class="cx">
</span><span class="cx"> /* $newer_date will equal false if we want to know the time elapsed between a date and the current time */
</span><span class="cx"> /* $newer_date will have a value if we want to work out time elapsed between two known dates */
</span><del>- $newer_date = ( !$newer_date ) ? ( strtotime( gmdate( 'Y-m-d H:i:s' ) ) + ( 60*60*0 ) ) : $newer_date;
</del><ins>+ $newer_date = ( !$newer_date ) ? gmmktime() : $newer_date;
</ins><span class="cx">
</span><span class="cx"> /* Difference in seconds */
</span><span class="cx"> $since = $newer_date - $older_date;
</span><span class="lines">@@ -1393,8 +1394,6 @@
</span><span class="cx"> $seconds2 = $chunks[$i + 1][0];
</span><span class="cx"> $name2 = $chunks[$i + 1][1];
</span><span class="cx">
</span><del>- //if ( $chunks[$i + 1][1] == __( 'second', 'buddypress' ) ) return $output;
-
</del><span class="cx"> if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
</span><span class="cx"> /* Add to output var */
</span><span class="cx"> $output .= ( 1 == $count2 ) ? _c( ',|Separator in time since', 'buddypress' ) . ' 1 '. $chunks[$i + 1][1] : _c( ',|Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-friends.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -275,14 +275,13 @@
</span><span class="cx"> 'type' => false,
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'secondary_item_id' => false,
</span><del>- 'recorded_time' => time(),
</del><span class="cx"> 'hide_sitewide' => false
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- 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 ) );
</del><ins>+ 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 ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function friends_delete_activity( $args ) {
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-groups.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -1325,14 +1325,13 @@
</span><span class="cx"> 'type' => false,
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'secondary_item_id' => false,
</span><del>- 'recorded_time' => time(),
</del><span class="cx"> 'hide_sitewide' => $hide_sitewide
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- 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 ) );
</del><ins>+ 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 ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_update_last_activity( $group_id ) {
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2415 => 2416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-01-24 12:14:28 UTC (rev 2415)
+++ trunk/bp-xprofile.php 2010-01-24 13:13:15 UTC (rev 2416)
</span><span class="lines">@@ -489,14 +489,13 @@
</span><span class="cx"> 'type' => false,
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'secondary_item_id' => false,
</span><del>- 'recorded_time' => time(),
</del><span class="cx"> 'hide_sitewide' => false
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- 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 ) );
</del><ins>+ 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 ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>