Changeset 4258

Timestamp:

04/23/2011 05:04:59 PM (15 years ago)

Author:

boonebgorges

Message:

Loads BP core files when the setup wizard is finished, so that the redirect completes successfully. Fixes #3152

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (1 diff)

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

@@ -1007 +1007 @@
                         @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
 
+                        // Load BP, so that the redirect is successful                  
+                        require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
+
                         // Redirect to the BuddyPress dashboard
-                        $redirect = is_multisite() ? network_admin_url( add_query_arg( array( 'page' => 'bp-general-settings' ) ) ) : admin_url( add_query_arg( array( 'page' => 'bp-general-settings' ) ) );
+                        $redirect = is_multisite() ? add_query_arg( array( 'page' => 'bp-general-settings' ), network_admin_url( 'admin.php' ) ) : add_query_arg( array( 'page' => 'bp-general-settings' ), admin_url( 'admin.php' ) );
 
                         wp_redirect( $redirect );