Changeset 4556 for trunk/bp-loader.php

Timestamp:

06/24/2011 05:12:13 PM (15 years ago)

Author:

boonebgorges

Message:

Ensures that upgrades from BP 1.2.x are recognized as upgrades, and previous component settings are saved. Fixes #3153. Props cnorris23

File:

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

trunk/bp-loader.php

@@ -60 +60 @@
 if ( !$bp->database_version = get_site_option( 'bp-db-version' ) ) {
         if ( $bp->database_version = get_option( 'bp-db-version' ) ) {
-                $bp->is_ms_activate = 1;
+                $bp->is_network_activate = 1;
         } else {
                 $bp->database_version = get_site_option( 'bp-core-db-version' );  // BP 1.2 option
@@ -68 +68 @@
 // This is a new installation.
 if ( empty( $bp->database_version ) ) {
-        $bp->maintenence_mode = 'install';
+        $bp->maintenance_mode = 'install';
         require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
 
@@ -77 +77 @@
 
         // Check if an update is required
-        if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) || isset( $bp->is_ms_activate ) ) {
-                $bp->maintenence_mode = 'update';
+        if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) || isset( $bp->is_network_activate ) ) {
+                $bp->maintenance_mode = 'update';
                 require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
         }