Ticket #3134: bp-code-loader.php-directories.diff

bp-core/bp-core-loader.php

@@ -55 +55 @@
                 // Set the required components
                 $bp->required_components    = apply_filters( 'bp_required_components',    array( 'members', ) );
 
+                // Set plugin directories
+                $bp->plugin_directories = apply_filters( 'bp_plugin_directories', array(BP_PLUGIN_DIR) );
+                
                 // Get a list of activated components
                 if ( $active_components = get_site_option( 'bp-active-components' ) ) {
                         $bp->active_components      = apply_filters( 'bp_active_components',      $active_components );
@@ -82 +85 @@
 
                 // Loop through optional components
                 foreach( $bp->optional_components as $component )
-                        if ( bp_is_active( $component ) && file_exists( BP_PLUGIN_DIR . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) )
-                                include( BP_PLUGIN_DIR . '/bp-' . $component . '/bp-' . $component . '-loader.php' );
+                        foreach ( $bp->plugin_directories as $directory )
+                                if ( bp_is_active( $component ) && file_exists( $directory . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) )
+                                        include( $directory . '/bp-' . $component . '/bp-' . $component . '-loader.php' );
 
                 // Loop through required components
-                foreach( $bp->required_components as $component )
-                        if ( file_exists( BP_PLUGIN_DIR . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) )
-                                include( BP_PLUGIN_DIR . '/bp-members/bp-members-loader.php' );
+                foreach( $bp->required_components as $component )               
+                        foreach ( $bp->plugin_directories as $directory )
+                                if ( file_exists( $directory . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) )
+                                        include( $directory . '/bp-members/bp-members-loader.php' );
 
                 // Add Core to required components
                 $bp->required_components[] = 'core';