<!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] [3006] branches/1.2: Fix loggedin/displayed/
user link function names and keep backcompat.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3006</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-05-17 09:14:04 +0000 (Mon, 17 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix loggedin/displayed/user link function names and keep backcompat.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoretemplatetagsphp">branches/1.2/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssinglememberheaderphp">branches/1.2/bp-themes/bp-default/members/single/member-header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-templatetags.php (3005 => 3006)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-templatetags.php 2010-05-17 08:59:06 UTC (rev 3005)
+++ branches/1.2/bp-core/bp-core-templatetags.php 2010-05-17 09:14:04 UTC (rev 3006)
</span><span class="lines">@@ -1247,8 +1247,8 @@
</span><span class="cx"> return apply_filters( 'bp_get_user_firstname', $fullname[0], $fullname );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_user_link() {
- echo apply_filters( 'bp_user_link', bp_get_loggedin_user_link() );
</del><ins>+function bp_loggedin_user_link() {
+ echo bp_get_loggedin_user_link();
</ins><span class="cx"> }
</span><span class="cx"> function bp_get_loggedin_user_link() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -1256,21 +1256,24 @@
</span><span class="cx"> return apply_filters( 'bp_get_loggedin_user_link', $bp->loggedin_user->domain );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_loggedin_user_link() {
</del><ins>+/* @todo Deprecate incorrectly named function? */
+function bp_loggedinuser_link() {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( $link = bp_core_get_userlink( $bp->loggedin_user->id ) )
</span><span class="cx"> echo apply_filters( 'bp_loggedin_user_link', $link );
</span><span class="cx"> }
</span><del>-/* @todo Deprecate incorrectly named function? */
-function bp_loggedinuser_link() { bp_loggedin_user_link(); }
</del><span class="cx">
</span><del>-function bp_get_displayed_user_link() {
- global $bp;
-
- return apply_filters( 'bp_get_displayed_user_link', $bp->displayed_user->domain );
</del><ins>+function bp_displayed_user_link() {
+ echo bp_get_loggedin_user_link();
</ins><span class="cx"> }
</span><ins>+function bp_user_link() { bp_displayed_user_link(); }
+ function bp_get_displayed_user_link() {
+ global $bp;
</ins><span class="cx">
</span><ins>+ return apply_filters( 'bp_get_displayed_user_link', $bp->displayed_user->domain );
+ }
+
</ins><span class="cx"> function bp_displayed_user_id() {
</span><span class="cx"> global $bp;
</span><span class="cx"> return apply_filters( 'bp_displayed_user_id', $bp->displayed_user->id );
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssinglememberheaderphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/member-header.php (3005 => 3006)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/member-header.php 2010-05-17 08:59:06 UTC (rev 3005)
+++ branches/1.2/bp-themes/bp-default/members/single/member-header.php 2010-05-17 09:14:04 UTC (rev 3006)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="item-header-content">
</span><span class="cx">
</span><del>- <h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
</del><ins>+ <h2 class="fn"><a href="<?php bp_displayed_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
</ins><span class="cx"> <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_member_header_meta' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>