Changeset 5660

Timestamp:

01/27/2012 09:35:32 PM (13 years ago)

Author:

boonebgorges

Message:

Do a better job of detecting when an upgrade is taking place, so as not to load multiple instances of the BuddyPress top-level menu before the installation wizard is run.
Fixes #3964

File:

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

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

@@ -176 +176 @@
         // Don't add this version of the admin menu if a BP upgrade is in progress.
         // @see bp_core_update_add_admin_menu().
-        if ( defined( 'BP_IS_UPGRADE' ) && BP_IS_UPGRADE )
+        if ( bp_is_update() || ( defined( 'BP_IS_UPGRADE' ) && BP_IS_UPGRADE ) )
             return;