Changeset 7756 for trunk/bp-core/bp-core-loader.php

Timestamp:

01/24/2014 11:48:48 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Replace BP_PLUGIN_DIR and BP_PLUGIN_URL constant usages with plugin_dir and plugin_url BuddyPress variables, respectively. Also replaces $bp global touches with buddypress() calls within the above scopes.

File:

• trunk/bp-core/bp-core-loader.php (modified) (2 diffs)

trunk/bp-core/bp-core-loader.php

@@ -22 +22 @@
          * @uses BP_Core::bootstrap()
          */
-        function __construct() {
+        public function __construct() {
                 parent::start(
                         'core',
-                        __( 'BuddyPress Core', 'buddypress' )
-                        , BP_PLUGIN_DIR
+                        __( 'BuddyPress Core', 'buddypress' ),
+                        buddypress()->plugin_dir
                 );
 
@@ -96 +96 @@
 
                 // 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->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' );
+                        }
+                }
 
                 // 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-' . $component . '/bp-' . $component . '-loader.php' );
+                foreach( $bp->required_components as $component ) {
+                        if ( file_exists( $bp->plugin_dir . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) ) {
+                                include( $bp->plugin_dir . '/bp-' . $component . '/bp-' . $component . '-loader.php' );
+                        }
+                }
 
                 // Add Core to required components