<!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" />
<title>[BuddyPress][4678] trunk: Swap '0 seconds ago' out for 'right now.' Includes changes to bp_core_time_since() and removes references to 'ago' as needed to avoid possible 'right now ago' condition.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/4678">4678</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-07-18 07:01:49 +0000 (Mon, 18 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Swap '0 seconds ago' out for 'right now.' Includes changes to bp_core_time_since() and removes references to 'ago' as needed to avoid possible 'right now ago' condition.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpblogsbpblogstemplatephp">trunk/bp-blogs/bp-blogs-template.php</a></li>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupswidgetsphp">trunk/bp-groups/bp-groups-widgets.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefaultforumssingleforumheaderphp">trunk/bp-themes/bp-default/forums/single/forum-header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupsgroupsloopphp">trunk/bp-themes/bp-default/groups/groups-loop.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglegroupheaderphp">trunk/bp-themes/bp-default/groups/single/group-header.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatephp">trunk/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-activity/bp-activity-template.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -1008,7 +1008,7 @@
</span><span class="cx"> if ( empty( $activities_template->activity->current_comment->date_recorded ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $date_recorded = sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->current_comment->date_recorded ) );
</del><ins>+ $date_recorded = bp_core_time_since( $activities_template->activity->current_comment->date_recorded );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_activity_comment_date_recorded', $date_recorded );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-template.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-template.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-blogs/bp-blogs-template.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> function bp_get_blog_last_active() {
</span><span class="cx"> global $blogs_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_blog_last_active', bp_core_get_last_activity( $blogs_template->blog->last_activity, __( 'active %s ago', 'buddypress' ) ) );
</del><ins>+ return apply_filters( 'bp_blog_last_active', bp_core_get_last_activity( $blogs_template->blog->last_activity, __( 'active %s', 'buddypress' ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blog_latest_post() {
</span></span></pre></div>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-core/bp-core-classes.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> $this->avatar = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full' ) );
</span><span class="cx"> $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb' ) );
</span><span class="cx"> $this->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
</span><del>- $this->last_active = bp_core_get_last_activity( bp_get_user_meta( $this->id, 'last_activity', true ), __( 'active %s ago', 'buddypress' ) );
</del><ins>+ $this->last_active = bp_core_get_last_activity( bp_get_user_meta( $this->id, 'last_activity', true ), __( 'active %s', 'buddypress' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-core/bp-core-functions.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -597,15 +597,20 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_time_since( $older_date, $newer_date = false ) {
</span><span class="cx">
</span><ins>+ // Setup the strings
+ $unknown_text = apply_filters( 'bp_core_time_since_unknown_text', __( 'sometime', 'buddypress' ) );
+ $right_now_text = apply_filters( 'bp_core_time_since_right_now_text', __( 'right now', 'buddypress' ) );
+ $ago_text = apply_filters( 'bp_core_time_since_ago_text', __( '%s ago', 'buddypress' ) );
+
</ins><span class="cx"> // array of time period chunks
</span><span class="cx"> $chunks = array(
</span><del>- array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
- array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
- array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
- array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
- array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
- array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
- array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
</del><ins>+ array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
+ array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
+ array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
+ array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
+ array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
+ array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
+ array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $older_date ) && !is_numeric( $older_date ) ) {
</span><span class="lines">@@ -625,45 +630,58 @@
</span><span class="cx"> $since = $newer_date - $older_date;
</span><span class="cx">
</span><span class="cx"> // Something went wrong with date calculation and we ended up with a negative date.
</span><del>- if ( 0 > $since )
- return __( 'sometime', 'buddypress' );
-
</del><ins>+ if ( 0 > $since ) {
+ $output = $unknown_text;
+
</ins><span class="cx"> /**
</span><span class="cx"> * We only want to output two chunks of time here, eg:
</span><span class="cx"> * x years, xx months
</span><span class="cx"> * x days, xx hours
</span><span class="cx"> * so there's only two bits of calculation below:
</span><span class="cx"> */
</span><ins>+ } else {
</ins><span class="cx">
</span><del>- // Step one: the first chunk
- for ( $i = 0, $j = count($chunks); $i < $j; $i++) {
- $seconds = $chunks[$i][0];
</del><ins>+ // Step one: the first chunk
+ for ( $i = 0, $j = count($chunks); $i < $j; $i++) {
+ $seconds = $chunks[$i][0];
</ins><span class="cx">
</span><del>- // Finding the biggest chunk (if the chunk fits, break)
- if ( ( $count = floor($since / $seconds) ) != 0 )
- break;
- }
</del><ins>+ // Finding the biggest chunk (if the chunk fits, break)
+ if ( ( $count = floor($since / $seconds) ) != 0 ) {
+ break;
+ }
+ }
</ins><span class="cx">
</span><del>- // If $i iterates all the way to $j, then the event happened 0 seconds ago
- if ( !isset( $chunks[$i] ) )
- return '0 ' . __( 'seconds', 'buddypress' );
</del><ins>+ // If $i iterates all the way to $j, then the event happened 0 seconds ago
+ if ( !isset( $chunks[$i] ) ) {
+ $output = $right_now_text;
</ins><span class="cx">
</span><del>- // Set output var
- $output = ( 1 == $count ) ? '1 '. $chunks[$i][1] : $count . ' ' . $chunks[$i][2];
</del><ins>+ } else {
</ins><span class="cx">
</span><del>- // Step two: the second chunk
- if ( $i + 2 < $j ) {
- $seconds2 = $chunks[$i + 1][0];
- $name2 = $chunks[$i + 1][1];
</del><ins>+ // Set output var
+ $output = ( 1 == $count ) ? '1 '. $chunks[$i][1] : $count . ' ' . $chunks[$i][2];
</ins><span class="cx">
</span><del>- if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
- // Add to output var
- $output .= ( 1 == $count2 ) ? _x( ',', 'Separator in time since', 'buddypress' ) . ' 1 '. $chunks[$i + 1][1] : _x( ',', 'Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
</del><ins>+ // Step two: the second chunk
+ if ( $i + 2 < $j ) {
+ $seconds2 = $chunks[$i + 1][0];
+ $name2 = $chunks[$i + 1][1];
+
+ if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
+ // Add to output var
+ $output .= ( 1 == $count2 ) ? _x( ',', 'Separator in time since', 'buddypress' ) . ' 1 '. $chunks[$i + 1][1] : _x( ',', 'Separator in time since', 'buddypress' ) . ' ' . $count2 . ' ' . $chunks[$i + 1][2];
+ }
+ }
+
+ // No output, so happened right now
+ if ( !(int)trim( $output ) ) {
+ $output = $right_now_text;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !(int)trim( $output ) )
- $output = '0 ' . __( 'seconds', 'buddypress' );
</del><ins>+ // Append 'ago' to the end of time-since if not 'right now'
+ if ( $output != $right_now_text ) {
+ $output = sprintf( $ago_text, $output );
+ }
</ins><span class="cx">
</span><span class="cx"> return $output;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-groups/bp-groups-template.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -1022,7 +1022,7 @@
</span><span class="cx">
</span><span class="cx"> <h5><?php echo bp_core_get_userlink( $admin->user_id ) ?></h5>
</span><span class="cx"> <span class="activity">
</span><del>- <?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s ago', 'buddypress') ); ?>
</del><ins>+ <?php echo bp_core_get_last_activity( strtotime( $admin->date_modified ), __( 'joined %s', 'buddypress') ); ?>
</ins><span class="cx"> </span>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'friends' ) ) : ?>
</span><span class="lines">@@ -1087,7 +1087,7 @@
</span><span class="cx">
</span><span class="cx"> <h5><?php echo bp_core_get_userlink( $mod->user_id ) ?></h5>
</span><span class="cx">
</span><del>- <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s ago', 'buddypress') ); ?></span>
</del><ins>+ <span class="activity"><?php echo bp_core_get_last_activity( strtotime( $mod->date_modified ), __( 'joined %s', 'buddypress') ); ?></span>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'friends' ) ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -1852,7 +1852,7 @@
</span><span class="cx"> function bp_get_group_member_joined_since() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( $members_template->member->date_modified, __( 'joined %s ago', 'buddypress') ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_joined_since', bp_core_get_last_activity( $members_template->member->date_modified, __( 'joined %s', 'buddypress') ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_member_id() {
</span><span class="lines">@@ -2508,7 +2508,7 @@
</span><span class="cx"> function bp_group_request_time_since_requested() {
</span><span class="cx"> global $requests_template;
</span><span class="cx">
</span><del>- echo apply_filters( 'bp_group_request_time_since_requested', sprintf( __( 'requested %s ago', 'buddypress' ), bp_core_time_since( strtotime( $requests_template->request->date_modified ) ) ) );
</del><ins>+ echo apply_filters( 'bp_group_request_time_since_requested', sprintf( __( 'requested %s', 'buddypress' ), bp_core_time_since( strtotime( $requests_template->request->date_modified ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_request_comment() {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-widgets.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-widgets.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-groups/bp-groups-widgets.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> <span class="activity">
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'newest' == $instance['group_default'] )
</span><del>- printf( __( 'created %s ago', 'buddypress' ), bp_get_group_date_created() );
</del><ins>+ printf( __( 'created %s', 'buddypress' ), bp_get_group_date_created() );
</ins><span class="cx"> if ( 'active' == $instance['group_default'] )
</span><del>- printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() );
</del><ins>+ printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() );
</ins><span class="cx"> else if ( 'popular' == $instance['group_default'] )
</span><span class="cx"> bp_group_member_count();
</span><span class="cx"> ?>
</span><span class="lines">@@ -164,9 +164,9 @@
</span><span class="cx"> <span class="activity">
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'newest-groups' == $_POST['filter'] ) {
</span><del>- printf( __( 'created %s ago', 'buddypress' ), bp_get_group_date_created() );
</del><ins>+ printf( __( 'created %s', 'buddypress' ), bp_get_group_date_created() );
</ins><span class="cx"> } else if ( 'recently-active-groups' == $_POST['filter'] ) {
</span><del>- printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() );
</del><ins>+ printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() );
</ins><span class="cx"> } else if ( 'popular-groups' == $_POST['filter'] ) {
</span><span class="cx"> bp_group_member_count();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-members/bp-members-template.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><span class="cx"> if ( isset( $members_template->member->last_activity ) )
</span><del>- $last_activity = bp_core_get_last_activity( $members_template->member->last_activity, __( 'active %s ago', 'buddypress' ) );
</del><ins>+ $last_activity = bp_core_get_last_activity( $members_template->member->last_activity, __( 'active %s', 'buddypress' ) );
</ins><span class="cx"> else
</span><span class="cx"> $last_activity = __( 'Never active', 'buddypress' );
</span><span class="cx">
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> function bp_get_member_registered() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- $registered = esc_attr( bp_core_get_last_activity( $members_template->member->user_registered, __( 'registered %s ago', 'buddypress' ) ) );
</del><ins>+ $registered = esc_attr( bp_core_get_last_activity( $members_template->member->user_registered, __( 'registered %s', 'buddypress' ) ) );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_member_last_active', $registered );
</span><span class="cx"> }
</span><span class="lines">@@ -750,7 +750,7 @@
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- $last_activity = bp_core_get_last_activity( bp_get_user_meta( $user_id, 'last_activity', true ), __('active %s ago', 'buddypress') );
</del><ins>+ $last_activity = bp_core_get_last_activity( bp_get_user_meta( $user_id, 'last_activity', true ), __('active %s', 'buddypress') );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_last_activity', $last_activity );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-messages/bp-messages-template.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx"> function bp_get_the_thread_message_time_since() {
</span><span class="cx"> global $thread_template;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_the_thread_message_time_since', sprintf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( strtotime( $thread_template->message->date_sent ) ) ) );
</del><ins>+ return apply_filters( 'bp_get_the_thread_message_time_since', sprintf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( strtotime( $thread_template->message->date_sent ) ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_thread_message_content() {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> <?php do_action( 'bp_before_message_meta' ) ?>
</span><span class="cx"> <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
</span><span class="cx">
</span><del>- <strong><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?></span></strong>
</del><ins>+ <strong><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?></span></strong>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_message_meta' ) ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultforumssingleforumheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/single/forum-header.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/single/forum-header.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-themes/bp-default/forums/single/forum-header.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="item-header-content">
</span><span class="cx"> <h2><a href="<?php bp_forum_permalink(); ?>" title="<?php bp_forum_name(); ?>"><?php bp_forum_name(); ?></a></h2>
</span><del>- <span class="highlight"><?php //bp_forum_type(); ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), '' ); //bp_get_forum_last_active() ); ?></span>
</del><ins>+ <span class="highlight"><?php //bp_forum_type(); ?></span> <span class="activity"><?php printf( __( 'active %s', 'buddypress' ), '' ); //bp_get_forum_last_active() ); ?></span>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_forum_header_meta' ); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupsgroupsloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/groups-loop.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/groups-loop.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-themes/bp-default/groups/groups-loop.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="item">
</span><span class="cx"> <div class="item-title"><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a></div>
</span><del>- <div class="item-meta"><span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ); ?></span></div>
</del><ins>+ <div class="item-meta"><span class="activity"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span></div>
</ins><span class="cx">
</span><span class="cx"> <div class="item-desc"><?php bp_group_description_excerpt(); ?></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglegroupheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/group-header.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/group-header.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-themes/bp-default/groups/single/group-header.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="item-header-content">
</span><span class="cx"> <h2><a href="<?php bp_group_permalink(); ?>" title="<?php bp_group_name(); ?>"><?php bp_group_name(); ?></a></h2>
</span><del>- <span class="highlight"><?php bp_group_type(); ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ); ?></span>
</del><ins>+ <span class="highlight"><?php bp_group_type(); ?></span> <span class="activity"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_header_meta' ); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-template.php (4677 => 4678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-template.php 2011-07-18 00:49:58 UTC (rev 4677)
+++ trunk/bp-xprofile/bp-xprofile-template.php 2011-07-18 07:01:49 UTC (rev 4678)
</span><span class="lines">@@ -713,7 +713,7 @@
</span><span class="cx"> $last_updated = bp_get_user_meta( $bp->displayed_user->id, 'profile_last_updated', true );
</span><span class="cx">
</span><span class="cx"> if ( $last_updated )
</span><del>- return apply_filters( 'bp_get_profile_last_updated', sprintf( __('Profile updated %s ago', 'buddypress'), bp_core_time_since( strtotime( $last_updated ) ) ) );
</del><ins>+ return apply_filters( 'bp_get_profile_last_updated', sprintf( __('Profile updated %s', 'buddypress'), bp_core_time_since( strtotime( $last_updated ) ) ) );
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>