<!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] [2312] trunk: Fixes #1509 - sub-nav items with custom slugs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2312</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-15 15:46:16 +0000 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1509 - sub-nav items with custom slugs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.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 (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2010-01-15 15:03:18 UTC (rev 2311)
+++ trunk/bp-core/bp-core-adminbar.php 2010-01-15 15:46:16 UTC (rev 2312)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> // **** "My Account" Menu ******
</span><span class="cx"> function bp_adminbar_account_menu() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -65,11 +66,11 @@
</span><span class="cx"> echo '<li' . $alt . '>';
</span><span class="cx"> echo '<a id="bp-admin-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
</span><span class="cx">
</span><del>- if ( is_array( $bp->bp_options_nav[$nav_item['css_id']] ) ) {
</del><ins>+ if ( is_array( $bp->bp_options_nav[$nav_item['slug']] ) ) {
</ins><span class="cx"> echo '<ul>';
</span><span class="cx"> $sub_counter = 0;
</span><span class="cx">
</span><del>- foreach( $bp->bp_options_nav[$nav_item['css_id']] as $subnav_item ) {
</del><ins>+ foreach( $bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
</ins><span class="cx"> $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
</span><span class="cx"> echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';
</span><span class="cx"> $sub_counter++;
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-15 15:03:18 UTC (rev 2311)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-15 15:46:16 UTC (rev 2312)
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> if ( !$user_nav_item['show_for_displayed_user'] && !bp_is_my_profile() )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if ( $bp->current_component == $user_nav_item['css_id'] )
</del><ins>+ if ( $bp->current_component == $user_nav_item['slug'] )
</ins><span class="cx"> $selected = ' class="current"';
</span><span class="cx"> else
</span><span class="cx"> $selected = '';
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-15 15:03:18 UTC (rev 2311)
+++ trunk/bp-core.php 2010-01-15 15:46:16 UTC (rev 2312)
</span><span class="lines">@@ -644,6 +644,7 @@
</span><span class="cx">
</span><span class="cx"> $bp->bp_nav[$slug] = array(
</span><span class="cx"> 'name' => $name,
</span><ins>+ 'slug' => $slug,
</ins><span class="cx"> 'link' => $bp->loggedin_user->domain . $slug . '/',
</span><span class="cx"> 'css_id' => $item_css_id,
</span><span class="cx"> 'show_for_displayed_user' => $show_for_displayed_user,
</span></span></pre>
</div>
</div>
</body>
</html>