<!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] [2632] trunk/bp-core/bp-core-adminbar.php:
Fix for #1849 - will need to be properly addressed in 1.3.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2632</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-08 15:26:24 +0000 (Mon, 08 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix for #1849 - will need to be properly addressed in 1.3.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (2631 => 2632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2010-02-08 14:45:24 UTC (rev 2631)
+++ trunk/bp-core/bp-core-adminbar.php 2010-02-08 15:26:24 UTC (rev 2632)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> if ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ $bp->doing_admin_bar = true;
+
</ins><span class="cx"> echo '<div id="wp-admin-bar"><div class="padder">';
</span><span class="cx">
</span><span class="cx"> // **** Do bp-adminbar-logo Actions ********
</span><span class="lines">@@ -21,6 +23,8 @@
</span><span class="cx">
</span><span class="cx"> echo '</ul>';
</span><span class="cx"> echo "</div></div><!-- #wp-admin-bar -->\n\n";
</span><ins>+
+ $bp->doing_admin_bar = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // **** Default BuddyPress admin bar logo ********
</span><span class="lines">@@ -71,8 +75,10 @@
</span><span class="cx"> $sub_counter = 0;
</span><span class="cx">
</span><span class="cx"> foreach( (array)$bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
</span><ins>+ $link = str_replace( $bp->displayed_user->domain, $bp->loggedin_user->domain, $subnav_item['link'] );
+ $name = str_replace( $bp->displayed_user->userdata->user_login, $bp->loggedin_user->userdata->user_login, $subnav_item['name'] );
</ins><span class="cx"> $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
</span><del>- echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';
</del><ins>+ echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $link . '">' . $name . '</a></li>';
</ins><span class="cx"> $sub_counter++;
</span><span class="cx"> }
</span><span class="cx"> echo '</ul>';
</span></span></pre>
</div>
</div>
</body>
</html>