Changeset 2632

Timestamp:

02/08/2010 03:26:24 PM (15 years ago)

Author:

apeatling

Message:

Fix for #1849 - will need to be properly addressed in 1.3.

File:

• trunk/bp-core/bp-core-adminbar.php (modified) (3 diffs)

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

@@ -10 +10 @@
         return false;
 
+    $bp->doing_admin_bar = true;
+
     echo '<div id="wp-admin-bar"><div class="padder">';
 
@@ -22 +24 @@
     echo '</ul>';
     echo "</div></div><!-- #wp-admin-bar -->\n\n";
+
+    $bp->doing_admin_bar = false;
 }
 
@@ -72 +76 @@
 
             foreach( (array)$bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
+                $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'] );
                 $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>';
+                echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $link . '">' . $name . '</a></li>';
                 $sub_counter++;
             }