Ticket #2713: 2713.diff

src/includes/extend/buddypress/loader.php

@@ -258 +258 @@
                         $user_domain = bp_loggedin_user_domain();
                         $forums_link = trailingslashit( $user_domain . $this->slug );
 
+                        $my_account_link       = trailingslashit( $forums_link );
+                        $my_topics_link        = trailingslashit( $forums_link . bbp_get_topic_archive_slug() );
+                        $my_replies_link       = trailingslashit( $forums_link . bbp_get_reply_archive_slug() );
+                        $my_favorites_link     = trailingslashit( $forums_link . bbp_get_user_favorites_slug() );
+                        $my_subscriptions_link = trailingslashit( $forums_link . bbp_get_user_subscriptions_slug() );
+
+                        // If BuddyPress is network activated and bbPress is
+                        // not activated on a the root blog but on any child one
+                        if ( bp_get_root_blog_id() != get_current_blog_id() ) {
+                                $my_account_link       = bbp_get_user_profile_url();
+                                $my_topics_link        = bbp_get_user_topics_created_url();
+                                $my_replies_link       = bbp_get_user_replies_created_url();
+                                $my_favorites_link     = bbp_get_favorites_permalink();
+                                $my_subscriptions_link = bbp_get_subscriptions_permalink();
+                        }
+
                         // Add the "My Account" sub menus
                         $wp_admin_nav[] = array(
                                 'parent' => buddypress()->my_account_menu_id,
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => __( 'Forums', 'bbpress' ),
-                                'href'   => trailingslashit( $forums_link )
+                                'href'   => $my_account_link
                         );
 
                         // Topics
@@ -271 +287 @@
                                 'parent' => 'my-account-' . $this->id,
                                 'id'     => 'my-account-' . $this->id . '-topics',
                                 'title'  => __( 'Topics Started', 'bbpress' ),
-                                'href'   => trailingslashit( $forums_link . bbp_get_topic_archive_slug() )
+                                'href'   => $my_topics_link
                         );
 
                         // Replies
@@ -279 +295 @@
                                 'parent' => 'my-account-' . $this->id,
                                 'id'     => 'my-account-' . $this->id . '-replies',
                                 'title'  => __( 'Replies Created', 'bbpress' ),
-                                'href'   => trailingslashit( $forums_link . bbp_get_reply_archive_slug() )
+                                'href'   => $my_replies_link
                         );
 
                         // Favorites
@@ -287 +303 @@
                                 'parent' => 'my-account-' . $this->id,
                                 'id'     => 'my-account-' . $this->id . '-favorites',
                                 'title'  => __( 'Favorite Topics', 'bbpress' ),
-                                'href'   => trailingslashit( $forums_link . bbp_get_user_favorites_slug() )
+                                'href'   => $my_favorites_link
                         );
 
                         // Subscriptions
@@ -295 +311 @@
                                 'parent' => 'my-account-' . $this->id,
                                 'id'     => 'my-account-' . $this->id . '-subscriptions',
                                 'title'  => __( 'Subscribed Topics', 'bbpress' ),
-                                'href'   => trailingslashit( $forums_link . bbp_get_user_subscriptions_slug() )
+                                'href'   => $my_subscriptions_link
                         );
                 }
 

src/includes/extend/buddypress/members.php

@@ -85 +85 @@
          * @return string
          */
         public function user_profile_url( $user_id ) {
+                if ( bp_get_root_blog_id() != get_current_blog_id() ) {
+                        return false;
+                }
 
                 // Define local variable(s)
                 $profile_url    = '';
@@ -127 +130 @@
          * @return string
          */
         public function get_favorites_permalink( $url, $user_id ) {
+                if ( bp_get_root_blog_id() != get_current_blog_id() ) {
+                        return $url;
+                }
+
                 $component_slug = bbpress()->extend->buddypress->slug;
                 $url            = trailingslashit( bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_user_favorites_slug() );
                 return $url;
@@ -141 +148 @@
          * @return string
          */
         public function get_subscriptions_permalink( $url, $user_id ) {
+                if ( bp_get_root_blog_id() != get_current_blog_id() ) {
+                        return $url;
+                }
+
                 $component_slug = bbpress()->extend->buddypress->slug;
                 $url            = trailingslashit( bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_user_subscriptions_slug() );
                 return $url;