Ticket #6765: 6765-01.patch

src/bp-core/bp-core-template.php

@@ -120 +120 @@
 function bp_get_directory_title( $component = '' ) {
         $title = '';
 
-        // Use the string provided by the component.
-        if ( ! empty( buddypress()->{$component}->directory_title ) ) {
+        /*
+        * Use the 'title' string set in bp_core_get_directory_pages() &
+        * built from either wp_get_cache('directory_pages', 'bp') or from a wbdb post query
+        * This allows us to print the WP Page name as set or changed by the user.
+        */
+        if ( ! empty( bp_core_get_directory_pages()->{$component}->title ) ) {
+                $title = bp_core_get_directory_pages()->{$component}->title;
+
+        // Or use the string provided by the component in bp-{component}-loader.php setup_globals.
+        } elseif ( ! empty( buddypress()->{$component}->directory_title ) ) {
                 $title = buddypress()->{$component}->directory_title;
 
         // If none is found, concatenate.