Changeset 2312

Timestamp:

01/15/2010 03:46:16 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1509 - sub-nav items with custom slugs.

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-adminbar.php (modified) (2 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)

trunk/bp-core.php

@@ -645 +645 @@
     $bp->bp_nav[$slug] = array(
         'name' => $name,
+        'slug' => $slug,
         'link' => $bp->loggedin_user->domain . $slug . '/',
         'css_id' => $item_css_id,

trunk/bp-core/bp-core-adminbar.php

@@ -45 +45 @@
     }
 }
+
 
 // **** "My Account" Menu ******
@@ -66 +67 @@
         echo '<a id="bp-admin-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
 
-        if ( is_array( $bp->bp_options_nav[$nav_item['css_id']] ) ) {
+        if ( is_array( $bp->bp_options_nav[$nav_item['slug']] ) ) {
             echo '<ul>';
             $sub_counter = 0;
 
-            foreach( $bp->bp_options_nav[$nav_item['css_id']] as $subnav_item ) {
+            foreach( $bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
                 $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
                 echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';

trunk/bp-core/bp-core-templatetags.php

@@ -478 +478 @@
             continue;
 
-        if ( $bp->current_component == $user_nav_item['css_id'] )
+        if ( $bp->current_component == $user_nav_item['slug'] )
             $selected = ' class="current"';
         else