Skip to:
Content

BuddyPress.org

Changeset 4556 for trunk/bp-loader.php


Ignore:
Timestamp:
06/24/2011 05:12:13 PM (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-loader.php

    r4444 r4556  
    6060if ( !$bp->database_version = get_site_option( 'bp-db-version' ) ) {
    6161    if ( $bp->database_version = get_option( 'bp-db-version' ) ) {
    62         $bp->is_ms_activate = 1;
     62        $bp->is_network_activate = 1;
    6363    } else {
    6464        $bp->database_version = get_site_option( 'bp-core-db-version' );  // BP 1.2 option
     
    6868// This is a new installation.
    6969if ( empty( $bp->database_version ) ) {
    70     $bp->maintenence_mode = 'install';
     70    $bp->maintenance_mode = 'install';
    7171    require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
    7272
     
    7777
    7878    // Check if an update is required
    79     if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) || isset( $bp->is_ms_activate ) ) {
    80         $bp->maintenence_mode = 'update';
     79    if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) || isset( $bp->is_network_activate ) ) {
     80        $bp->maintenance_mode = 'update';
    8181        require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
    8282    }
Note: See TracChangeset for help on using the changeset viewer.