Changeset 4203 for trunk/bp-loader.php

Timestamp:

04/14/2011 01:36:19 PM (15 years ago)

Author:

boonebgorges

Message:

Keeps bp-default from loading during MS upgrade process. Fixes #3015. Refactors parts of the upgrade wizard to make MS upgrades recognize previous installations of BP. Refactors parts of the upgrade wizard to use bp-active-components rather than the deprecated bp-deactivated-components. Ensures that MS upgrades are seen as upgrades rather than new installations.

File:

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

trunk/bp-loader.php

@@ -57 +57 @@
 
 // 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
+if ( !$bp->database_version = get_site_option( 'bp-db-version' ) ) {
+    if ( $bp->database_version = get_option( 'bp-db-version' ) ) {
+        $bp->is_ms_activate = 1;
+    } else {
+        $bp->database_version = get_site_option( 'bp-core-db-version' );  // BP 1.2 option
+    }
+}
 
 // This is a new installation.
@@ -71 +76 @@
 
     // Check if an update is required
-    if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) ) {
+    if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) || isset( $bp->is_ms_activate ) ) {
         $bp->maintenence_mode = 'update';
         require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );