Skip to:
Content

BuddyPress.org

Changeset 5439


Ignore:
Timestamp:
12/04/2011 06:21:58 PM (12 years ago)
Author:
boonebgorges
Message:

Modifies loader to detect previous MS installations more reliably. Fixes redirect after finishing installation/upgrade wizard. Fixes #3790

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/admin/bp-core-update.php

    r5406 r5439  
    11341134
    11351135            // Redirect to the BuddyPress dashboard
    1136             $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-general-config' ), network_admin_url( 'admin.php' ) ) : add_query_arg( array( 'page' => 'bp-general-config' ), admin_url( 'admin.php' ) );
     1136            $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-general-config' ), network_admin_url( 'settings.php' ) ) : add_query_arg( array( 'page' => 'bp-general-config' ), admin_url( 'options-general.php' ) );
    11371137
    11381138            wp_redirect( $redirect );
  • trunk/bp-loader.php

    r5411 r5439  
    431431        $versions               = array();
    432432        $versions['1.2']        = get_site_option( 'bp-core-db-version' );
    433         $versions['1.5-single'] = get_site_option( 'bp-db-version'      );
    434         $versions['1.5-multi']  = get_option     ( 'bp-db-version'      );
    435         $versions['1.6']        = get_option     ( '_bp_db_version'     );
     433        $versions['1.5-multi']  = get_site_option( 'bp-db-version'      );
     434        $versions['1.5-single'] = get_option     ( 'bp-db-version'      );
     435        $versions['1.6-multi']  = get_site_option( '_bp_db_version'     );
     436        $versions['1.6-single'] = get_option     ( '_bp_db_version'     );
    436437
    437438        // Remove empty array items
     
    441442        $this->db_version_raw = !empty( $versions ) ? (int) max( $versions ) : 0;
    442443
    443         // Are we network activated?
    444         if ( is_multisite() && empty( $versions['1.5-multi'] ) )
     444        // Is this an upgrade to WordPress Network Mode?
     445        // We know by checking to see whether the db version is saved in sitemeta
     446        if ( is_multisite() && ( empty( $versions['1.5-multi'] ) && empty( $versions['1.6-multi'] ) ) )
    445447            $this->is_network_activate = true;
    446448
Note: See TracChangeset for help on using the changeset viewer.