Ticket #3428: 3428.02.patch

bp-activity/bp-activity-loader.php

@@ -76 +76 @@
                         'path'                  => BP_PLUGIN_DIR,
                         'slug'                  => BP_ACTIVITY_SLUG,
                         'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
+                        'has_directory'         => true,
                         'search_string'         => __( 'Search Activity...', 'buddypress' ),
                         'global_tables'         => $global_tables,
                         'notification_callback' => 'bp_activity_format_notifications',

bp-blogs/bp-blogs-loader.php

@@ -53 +53 @@
                         'path'                  => BP_PLUGIN_DIR,
                         'slug'                  => BP_BLOGS_SLUG,
                         'root_slug'             => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
+                        'has_directory'         => true,
                         'notification_callback' => 'bp_blogs_format_notifications',
                         'search_string'         => __( 'Search sites...', 'buddypress' ),
                         'autocomplete_all'      => defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ),

bp-core/admin/bp-core-admin.php

@@ -483 +483 @@
         // Get the existing WP pages
         $existing_pages = bp_core_get_page_meta();
 
-        // An array of strings looped over to create component setup markup
-        $directory_pages = array(
-                'members'  => __( 'Community Members', 'buddypress' ),
-                'activity' => __( 'Activity Streams',  'buddypress' ),
-                'groups'   => __( 'User Groups',       'buddypress' ),
-                'forums'   => __( 'Discussion Forums', 'buddypress' ),
-        );
-
-        if ( is_multisite() )
-                $directory_pages['blogs'] = __( "Site Directory", 'buddypress' ); ?>
+        // Now, set up an array of components (along with component names) that have directory pages
+        $directory_pages = array();
+        foreach( $bp->loaded_components as $component_id => $data ) {
+                if ( isset( $bp->{$component_id} ) ) {
+                        // Only components that need directories should be listed here
+                        if ( empty( $bp->{$component_id}->has_directory ) )
+                                continue;
+                        
+                        // component->name was introduced in BP 1.5, so we must provide a fallback
+                        $component_name = isset( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $component_id );
+                        
+                        $directory_pages[$component_id] = $component_name;
+                        
+                }
+        }
+        
+        $directory_pages = apply_filters( 'bp_directory_pages', $directory_pages );
+        
+        ?>
         
         <h3><?php _e( 'Directories', 'buddypress' ); ?></h3>
         

bp-core/bp-core-component.php

@@ -33 +33 @@
          * @var string Unique slug (used in query string and permalinks)
          */
         var $slug;
+        
+        /**
+         * @var bool Does this component need a top-level directory? 
+         */
+        var $has_directory;
 
         /**
          * @var string The path to the plugins files
@@ -107 +112 @@
                 $defaults = array(
                         'slug'                  => '',
                         'root_slug'             => '',
+                        'has_directory'         => false,
                         'notification_callback' => '',
                         'search_string'         => '',
                         'global_tables'         => ''
@@ -119 +125 @@
                 // Slug used for root directory
                 $this->root_slug     = apply_filters( 'bp_' . $this->id . '_root_slug',     $r['root_slug']     );
 
+                // Does this component have a top-level directory?
+                $this->has_directory = apply_filters( 'bp_' . $this->id . '_has_directory', $r['has_directory'] );
+
                 // Search string
                 $this->search_string = apply_filters( 'bp_' . $this->id . '_search_string', $r['search_string'] );
 

bp-core/bp-core-functions.php

@@ -92 +92 @@
                 }
         }
 
+        foreach( $page_ids as $component_name => $page_id ) {
+                if ( empty( $component_name ) || empty( $page_id ) )
+                        unset( $page_ids[$component_name] );
+        }
+
         return apply_filters( 'bp_core_get_page_meta', $page_ids );
 }
 
@@ -121 +126 @@
 function bp_core_get_page_names() {
         global $wpdb, $bp;
 
-        // Set pages as standard class
-        $pages = new stdClass;
-
         // Get pages and IDs
         if ( $page_ids = bp_core_get_page_meta() ) {
+                
+                // Set pages as standard class
+                $pages = new stdClass;
 
                 $posts_table_name = bp_is_multiblog_mode() ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
                 $page_ids_sql     = implode( ',', (array)$page_ids );
@@ -420 +425 @@
         $wp_page_components  = array();
 
         // Only some BP components require a WP page to function - those with a non-empty root_slug
-        foreach( $bp->active_components as $component_id => $is_active ) {
-                if ( !empty( $bp->{$component_id}->root_slug ) ) {
+        foreach( $bp->loaded_components as $component_id => $is_active ) {
+                if ( !empty( $bp->{$component_id}->has_directory ) ) {
                         $wp_page_components[] = array(
                                 'id'    => $component_id,
-                                'name'  => $bp->{$component_id}->name
+                                'name'  => isset( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $bp->{$component_id}->id )
                         );
                 }
         }
@@ -1068 +1073 @@
 
         if ( empty( $bp->pages ) )
                 $bp->pages = bp_core_get_page_names();
-
+                
         $match = false;
-
+        
         // Check if the slug is registered in the $bp->pages global
         foreach ( (array)$bp->pages as $key => $page ) {
                 if ( $key == $slug || $page->slug == $slug )
@@ -1082 +1087 @@
                 $bp->add_root[] = $slug;
                 add_action( 'bp_init', 'bp_core_create_root_component_page' );
         }
+        
+        // Make sure that this component is registered as requiring a top-level directory
+        if ( isset( $bp->{$slug} ) ) {
+                $bp->loaded_components[$bp->{$slug}->slug] = $bp->{$slug}->id;
+                $bp->{$slug}->has_directory = true;
+        }
 }
 
 function bp_core_create_root_component_page() {

bp-forums/bp-forums-loader.php

@@ -55 +55 @@
                 $globals = array(
                         'slug'                  => BP_FORUMS_SLUG,
                         'root_slug'             => isset( $bp->pages->forums->slug ) ? $bp->pages->forums->slug : BP_FORUMS_SLUG,
+                        'has_directory'         => true,
                         'notification_callback' => 'messages_format_notifications',
                         'search_string'         => __( 'Search Forums...', 'buddypress' ),
                 );

bp-groups/bp-groups-loader.php

@@ -78 +78 @@
                 $globals = array(
                         'slug'                  => BP_GROUPS_SLUG,
                         'root_slug'             => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
+                        'has_directory'         => true,
                         'notification_callback' => 'groups_format_notifications',
                         'search_string'         => __( 'Search Groups...', 'buddypress' ),
                         'global_tables'         => $global_tables

bp-members/bp-members-loader.php

@@ -65 +65 @@
                 $globals = array(
                         'slug'          => BP_MEMBERS_SLUG,
                         'root_slug'     => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : BP_MEMBERS_SLUG,
+                        'has_directory' => true,
                         'search_string' => __( 'Search Members...', 'buddypress' ),
                 );