<!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][7846] trunk: Add 'active_format' parameter to bp_get_member_last_active()</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/7846">7846</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-11 15:19:01 +0000 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add 'active_format' parameter to bp_get_member_last_active()
This new param allows theme authors to specify whether they'd like the current
user's last activity string in the format "Active 5 minutes ago" vs the simpler
"5 minutes ago".
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5387">#5387</a>
Props lenasterg</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkteststestcasesmemberstemplatephp">trunk/tests/testcases/members/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (7845 => 7846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2014-02-11 15:01:20 UTC (rev 7845)
+++ trunk/bp-members/bp-members-template.php 2014-02-11 15:19:01 UTC (rev 7846)
</span><span class="lines">@@ -586,16 +586,40 @@
</span><span class="cx"> add_filter( 'bp_get_member_name', 'strip_tags' );
</span><span class="cx"> add_filter( 'bp_get_member_name', 'esc_html' );
</span><span class="cx">
</span><del>-function bp_member_last_active() {
- echo bp_get_member_last_active();
</del><ins>+/**
+ * Output the current member's last active time.
+ *
+ * @param array $args See {@link bp_get_member_last_active()}.
+ */
+function bp_member_last_active( $args = array() ) {
+ echo bp_get_member_last_active( $args );
</ins><span class="cx"> }
</span><del>- function bp_get_member_last_active() {
</del><ins>+ /**
+ * Return the current member's last active time.
+ *
+ * @param array $args {
+ * Array of optional arguments.
+ * @type bool $active_format If true, formatted "Active 5 minutes
+ * ago". If false, formatted "5 minutes ago". Default: true.
+ * }
+ * @return string
+ */
+ function bp_get_member_last_active( $args = array() ) {
</ins><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- if ( isset( $members_template->member->last_activity ) )
- $last_activity = bp_core_get_last_activity( $members_template->member->last_activity, __( 'active %s', 'buddypress' ) );
- else
</del><ins>+ $r = wp_parse_args( $args, array(
+ 'active_format' => true,
+ ) );
+
+ if ( isset( $members_template->member->last_activity ) ) {
+ if ( ! empty( $r['active_format'] ) ) {
+ $last_activity = bp_core_get_last_activity( $members_template->member->last_activity, __( 'active %s', 'buddypress' ) );
+ } else {
+ $last_activity = bp_core_time_since( $members_template->member->last_activity );
+ }
+ } else {
</ins><span class="cx"> $last_activity = __( 'Never active', 'buddypress' );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_member_last_active', $last_activity );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststestcasesmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/members/template.php (7845 => 7846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/members/template.php 2014-02-11 15:01:20 UTC (rev 7845)
+++ trunk/tests/testcases/members/template.php 2014-02-11 15:19:01 UTC (rev 7846)
</span><span class="lines">@@ -97,4 +97,48 @@
</span><span class="cx"> $this->set_current_user( $old_user );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @group bp_get_member_last_active
+ */
+ public function test_bp_get_member_last_active_default_params() {
+ // Fake the global
+ global $members_template;
+
+ $time = date( 'Y-m-d h:i:s', time() - 24*60*60 );
+ $members_template = new stdClass;
+ $members_template->member = new stdClass;
+ $members_template->member->last_activity = $time;
+
+ $this->assertEquals( bp_core_get_last_activity( $time, __( 'active %s', 'buddypress' ) ), bp_get_member_last_active() );
+ }
+
+ /**
+ * @group bp_get_member_last_active
+ */
+ public function test_bp_get_member_last_active_active_format_true() {
+ // Fake the global
+ global $members_template;
+
+ $time = date( 'Y-m-d h:i:s', time() - 24*60*60 );
+ $members_template = new stdClass;
+ $members_template->member = new stdClass;
+ $members_template->member->last_activity = $time;
+
+ $this->assertEquals( bp_core_get_last_activity( $time, __( 'active %s', 'buddypress' ) ), bp_get_member_last_active( array( 'active_format' => true, ) ) );
+ }
+
+ /**
+ * @group bp_get_member_last_active
+ */
+ public function test_bp_get_member_last_active_active_format_false() {
+ // Fake the global
+ global $members_template;
+
+ $time = date( 'Y-m-d h:i:s', time() - 24*60*60 );
+ $members_template = new stdClass;
+ $members_template->member = new stdClass;
+ $members_template->member->last_activity = $time;
+
+ $this->assertEquals( bp_core_time_since( $time ), bp_get_member_last_active( array( 'active_format' => false, ) ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>