Ticket #6765: 6765-02a.patch

src/bp-activity/classes/class-bp-activity-component.php

@@ -115 +115 @@
                         'slug'                  => BP_ACTIVITY_SLUG,
                         'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
                         'has_directory'         => true,
-                        'directory_title'       => _x( 'Site-Wide Activity', 'component directory title', 'buddypress' ),
+                        'directory_title'       => isset( $bp->pages->activity->title ) ? $bp->pages->activity->title : _x( 'Site-Wide Activity', 'component directory title', 'buddypress' ),
                         'notification_callback' => 'bp_activity_format_notifications',
                         'search_string'         => __( 'Search Activity...', 'buddypress' ),
                         'global_tables'         => $global_tables,

src/bp-blogs/classes/class-bp-blogs-component.php

@@ -70 +70 @@
                         'slug'                  => BP_BLOGS_SLUG,
                         'root_slug'             => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
                         'has_directory'         => is_multisite(), // Non-multisite installs don't need a top-level Sites directory, since there's only one site.
-                        'directory_title'       => _x( 'Sites', 'component directory title', 'buddypress' ),
+                        'directory_title'       => isset( $bp->pages->blogs->title ) ? $bp->pages->blogs->title : _x( 'Sites', 'component directory title', 'buddypress' ),
                         'notification_callback' => 'bp_blogs_format_notifications',
                         'search_string'         => __( 'Search sites...', 'buddypress' ),
                         'autocomplete_all'      => defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ),

src/bp-groups/classes/class-bp-groups-component.php

@@ -164 +164 @@
                         'slug'                  => BP_GROUPS_SLUG,
                         'root_slug'             => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
                         'has_directory'         => true,
-                        'directory_title'       => _x( 'Groups', 'component directory title', 'buddypress' ),
+                        'directory_title'       => isset( $bp->pages->groups->title ) ? $bp->pages->groups->title : _x( 'Groups', 'component directory title', 'buddypress' ),
                         'notification_callback' => 'groups_format_notifications',
                         'search_string'         => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
                         'global_tables'         => $global_tables,

src/bp-members/classes/class-bp-members-component.php

@@ -113 +113 @@
                         'slug'            => BP_MEMBERS_SLUG,
                         'root_slug'       => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
                         'has_directory'   => true,
-                        'directory_title' => _x( 'Members', 'component directory title', 'buddypress' ),
+                        'directory_title' => isset( $bp->pages->members->title ) ? $bp->pages->members->title : _x( 'Members', 'component directory title', 'buddypress' ),
                         'search_string'   => __( 'Search Members...', 'buddypress' ),
                         'global_tables'   => array(
                                 'table_name_last_activity' => bp_core_get_table_prefix() . 'bp_activity',