Changeset 3994 for trunk/bp-loader.php

Timestamp:

02/02/2011 04:35:06 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove temporary bp-core-bootstrap file and move procedure into BP_Core component. Update loaders accordingly. Also introduce optional_components and required_components global $bp values for additional future usage.

File:

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

trunk/bp-loader.php

@@ -9 +9 @@
  * Network:     true
  */
+
 /** Constants *****************************************************************/
 
@@ -18 +19 @@
 if ( !defined( 'BP_DB_VERSION' ) )
     define( 'BP_DB_VERSION', 3605 );
+
+// Place your custom code (actions/filters) in a file called
+// '/plugins/bp-custom.php' and it will be loaded before anything else.
+if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
+    require_once( WP_PLUGIN_DIR . '/bp-custom.php' );
 
 // Define on which blog ID BuddyPress should run
@@ -30 +36 @@
     define( 'BP_PLUGIN_URL', plugins_url( $path = '/buddypress' ) );
 
-// Load the WP abstraction file so BuddyPress can run on all WordPress setups.
-require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
-
-// Place your custom code (actions/filters) in a file called
-// '/plugins/bp-custom.php' and it will be loaded before anything else.
-if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
-    require_once( WP_PLUGIN_DIR . '/bp-custom.php' );
-
 // Define the user and usermeta table names, useful if you are using custom or shared tables.
 if ( !defined( 'CUSTOM_USER_TABLE' ) )
@@ -49 +47 @@
     define( 'BP_SEARCH_SLUG', 'search' );
 
+// Setup the BuddyPress theme directory
+register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
+
 /** Loader ********************************************************************/
 
-require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-bootstrap.php' );
+// Load the WP abstraction file so BuddyPress can run on all WordPress setups.
+require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-wpabstraction.php' );
+
+// Test to see whether this is a new installation or an upgraded version of BuddyPress
+if ( !$bp->database_version = get_site_option( 'bp-db-version' ) )
+    $bp->database_version = get_site_option( 'bp-core-db-version' );  // BP 1.2 option name
+
+// This is a new installation.
+if ( empty( $bp->database_version ) ) {
+    $bp->maintenence_mode = 'install';
+    require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
+
+// An update is required
+} elseif ( $bp->database_version < constant( 'BP_DB_VERSION' ) ) {
+    $bp->maintenence_mode = 'update';
+    require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
+
+// Existing installation - No maintenence required
+} else {
+    require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
+}
+
+/** Activation ****************************************************************/
 
 if ( !function_exists( 'bp_loader_activate' ) ) :