<!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] [2433] trunk: Show the user'
s display name in the mention notice.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2433</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-24 22:10:21 +0000 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Show the user's display name in the mention notice.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultactivitypostformphp">trunk/bp-themes/bp-default/activity/post-form.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2432 => 2433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-24 21:55:52 UTC (rev 2432)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-24 22:10:21 UTC (rev 2433)
</span><span class="lines">@@ -1254,7 +1254,17 @@
</span><span class="cx"> return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_mentioned_user_display_name( $user_id_or_username ) {
+ echo bp_get_mentioned_user_display_name( $user_id_or_username );
+}
+ function bp_get_mentioned_user_display_name( $user_id_or_username ) {
+ if ( !$name = bp_core_get_user_displayname( $user_id_or_username ) )
+ $name = __( 'a user' );
</ins><span class="cx">
</span><ins>+ return apply_filters( 'bp_get_mentioned_user_display_name', $name, $user_id_or_username );
+ }
+
+
</ins><span class="cx"> /*** CUSTOM LOOP TEMPLATE CLASSES *******************/
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1282,7 +1292,6 @@
</span><span class="cx"> return apply_filters( 'bp_loggedin_user_domain', $bp->loggedin_user->domain );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> function bp_displayed_user_fullname() {
</span><span class="cx"> echo bp_get_displayed_user_fullname();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2432 => 2433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-24 21:55:52 UTC (rev 2432)
+++ trunk/bp-core.php 2010-01-24 22:10:21 UTC (rev 2433)
</span><span class="lines">@@ -1107,9 +1107,17 @@
</span><span class="cx"> * @uses wp_cache_set() Adds a value to the cache.
</span><span class="cx"> * @return str The display name for the user in question.
</span><span class="cx"> */
</span><del>-function bp_core_get_user_displayname( $user_id ) {
</del><ins>+function bp_core_get_user_displayname( $user_id_or_username ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ if ( !$user_id_or_username )
+ return false;
+
+ if ( !is_numeric( $user_id_or_username ) )
+ $user_id = bp_core_get_userid( $user_id_or_username );
+ else
+ $user_id = $user_id_or_username;
+
</ins><span class="cx"> if ( !$user_id )
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2432 => 2433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-24 21:55:52 UTC (rev 2432)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-24 22:10:21 UTC (rev 2433)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> /* @message Compose Scrolling */
</span><span class="cx"> if ( j.query.get('r') ) {
</span><span class="cx"> if ( j('textarea#whats-new').length ) {
</span><del>- j.scrollTo( j('textarea#whats-new'), 500, { offset:-75, easing:'easeout' } );
</del><ins>+ j.scrollTo( j('textarea#whats-new'), 500, { offset:-125, easing:'easeout' } );
</ins><span class="cx"> j('textarea#whats-new').focus();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivitypostformphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/post-form.php (2432 => 2433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/post-form.php 2010-01-24 21:55:52 UTC (rev 2432)
+++ trunk/bp-themes/bp-default/activity/post-form.php 2010-01-24 22:10:21 UTC (rev 2433)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( isset( $_GET['r'] ) ) : ?>
</span><span class="cx"> <div id="message" class="info">
</span><del>- <p><?php _e( 'You are mentioning a user in a new update, this user will be sent a notification of your message.', 'buddypress' ) ?></p>
</del><ins>+ <p><?php printf( __( 'You are mentioning %s in a new update, this user will be sent a notification of your message.', 'buddypress' ), bp_get_mentioned_user_display_name( $_GET['r'] ) ) ?></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>