Changeset 5439

Timestamp:

12/04/2011 06:21:58 PM (13 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:

• bp-core/admin/bp-core-update.php (modified) (1 diff)
• bp-loader.php (modified) (2 diffs)

trunk/bp-core/admin/bp-core-update.php

@@ -1134 +1134 @@
 
             // Redirect to the BuddyPress dashboard
-            $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' ) );
+            $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' ) );
 
             wp_redirect( $redirect );

trunk/bp-loader.php

@@ -431 +431 @@
         $versions               = array();
         $versions['1.2']        = get_site_option( 'bp-core-db-version' );
-        $versions['1.5-single'] = get_site_option( 'bp-db-version'      );
-        $versions['1.5-multi']  = get_option     ( 'bp-db-version'      );
-        $versions['1.6']        = get_option     ( '_bp_db_version'     );
+        $versions['1.5-multi']  = get_site_option( 'bp-db-version'      );
+        $versions['1.5-single'] = get_option     ( 'bp-db-version'      );
+        $versions['1.6-multi']  = get_site_option( '_bp_db_version'     );
+        $versions['1.6-single'] = get_option     ( '_bp_db_version'     );
 
         // Remove empty array items
@@ -441 +442 @@
         $this->db_version_raw = !empty( $versions ) ? (int) max( $versions ) : 0;
 
-        // Are we network activated?
-        if ( is_multisite() && empty( $versions['1.5-multi'] ) )
+        // Is this an upgrade to WordPress Network Mode?
+        // We know by checking to see whether the db version is saved in sitemeta
+        if ( is_multisite() && ( empty( $versions['1.5-multi'] ) && empty( $versions['1.6-multi'] ) ) )
             $this->is_network_activate = true;