Changeset 3789 for trunk/bp-loader.php

Timestamp:

01/21/2011 10:34:00 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Load users and settings after other core components.

File:

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

trunk/bp-loader.php

@@ -75 +75 @@
     do_action( 'bp_core_loaded' );
 
-    // Users
-    include( BP_PLUGIN_DIR . '/bp-users/bp-users-loader.php'       );
-    include( BP_PLUGIN_DIR . '/bp-settings/bp-settings-loader.php' );
-
     // Activity Streams
     if ( !isset( $bp_deactivated['bp-activity/bp-activity-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity/bp-activity-loader.php') )
@@ -107 +103 @@
         include( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-loader.php' );
         
+    // Users
+    include( BP_PLUGIN_DIR . '/bp-users/bp-users-loader.php'       );
+
+    // Settings
+    include( BP_PLUGIN_DIR . '/bp-settings/bp-settings-loader.php' );
+
     // If this is an upgrade, load the upgrade file 
     if ( $bp_db_version < constant( 'BP_DB_VERSION' ) ) {