Changeset 4482 for trunk/bp-core/admin/bp-core-update.php

Timestamp:

06/10/2011 03:58:53 PM (15 years ago)

Author:

boonebgorges

Message:

Introduces bp_core_do_network_admin() and bp_core_admin_hook() for better BP_ENABLE_MULTIBLOG and multinetwork admin support. Changes BP admin menu to load in slot 3, so as not to override Dashboard menu on site admin. Props wpmuguru for help testing and thinking through

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (7 diffs)

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

@@ -146 +146 @@
                 $step_count  = count( $this->steps ) - 1;
                 $wiz_or_set  = $this->current_step >= $step_count ? 'bp-general-settings' : 'bp-wizard';
-                $form_action = is_multisite() ? network_admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) );
+                $form_action = bp_core_update_do_network_admin() ? network_admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) );
             ?>
 
@@ -1005 +1005 @@
 
             // Redirect to the BuddyPress dashboard
-            $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' ) );
+            $redirect = bp_core_update_do_network_admin() ? 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 );
@@ -1056 +1056 @@
     $bp_wizard = new BP_Core_Setup_Wizard;
 }
-add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_setup_wizard_init', 7 );
+add_action( bp_core_update_admin_hook(), 'bp_core_setup_wizard_init', 7 );
 
 function bp_core_install( $active_components = false ) {
@@ -1151 +1151 @@
 // interface is contained within.
 function bp_core_wizard_thickbox() {
-    $form_action = is_multisite() ? network_admin_url( add_query_arg( array( 'page' => 'bp-wizard', 'updated' => '1' ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => 'bp-wizard', 'updated' => '1' ), 'admin.php' ) ); ?>
+    $form_action = bp_core_update_do_network_admin() ? network_admin_url( add_query_arg( array( 'page' => 'bp-wizard', 'updated' => '1' ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => 'bp-wizard', 'updated' => '1' ), 'admin.php' ) ); ?>
 
     <script type="text/javascript">
@@ -1201 +1201 @@
     add_action( "admin_print_styles-$hook", 'bp_core_update_add_admin_menu_styles' );
 }
-add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu',  'bp_core_update_add_admin_menu', 9 );
+add_action( bp_core_update_admin_hook(),  'bp_core_update_add_admin_menu', 9 );
 
 function bp_core_update_add_admin_menu_styles() {
@@ -1254 +1254 @@
 }
 
+function bp_core_update_do_network_admin() {
+    $do_network_admin = false;
+    
+    if ( is_multisite() && ( !defined( 'BP_ENABLE_MULTIBLOG' ) || !BP_ENABLE_MULTIBLOG ) )
+        $do_network_admin = true;
+    
+    return apply_filters( 'bp_core_do_network_admin', $do_network_admin );
+}
+
+function bp_core_update_admin_hook() {
+    $hook = bp_core_update_do_network_admin() ? 'network_admin_menu' : 'admin_menu';
+    
+    return apply_filters( 'bp_core_admin_hook', $hook );
+}
+
 /**
  * Adds an admin nag about running the BP upgrade/install wizard
@@ -1270 +1285 @@
         return;
 
-    $url = is_multisite() ? network_admin_url( 'admin.php?page=bp-wizard' ) : admin_url( 'admin.php?page=bp-wizard' );
+    $url = bp_core_update_do_network_admin() ? network_admin_url( 'admin.php?page=bp-wizard' ) : admin_url( 'admin.php?page=bp-wizard' );
 
     switch( $bp->maintenence_mode ) {