Ticket #6765: 6765-02b.patch

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

@@ -226 +226 @@
          * }
          */
         public function setup_globals( $args = array() ) {
+                $bp = buddypress();
 
                 /** Slugs ************************************************************
                  */
 
                 // If a WP directory page exists for the component, it should
                 // be the default value of 'root_slug'.
-                $default_root_slug = isset( buddypress()->pages->{$this->id}->slug ) ? buddypress()->pages->{$this->id}->slug : '';
+                $default_root_slug = isset( $bp->pages->{$this->id}->slug ) ? $bp->pages->{$this->id}->slug : '';
 
                 $r = wp_parse_args( $args, array(
                         'slug'                  => $this->id,
@@ -273 +274 @@
                 $this->has_directory         = apply_filters( 'bp_' . $this->id . '_has_directory',         $r['has_directory']         );
 
                 /**
+                 * Use the WordPress Page title as the directory page title if it exists.
+                 */
+                if ( $this->has_directory && ! empty( $bp->pages->{$this->id}->title ) ) {
+                         $r['directory_title'] = $bp->pages->{$this->id}->title;
+                }
+
+                /**
                  * Filters the component's directory title.
                  *
                  * @since 2.0.0