Changeset 4482 for trunk/bp-core/admin/bp-core-admin.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-admin.php (modified) (5 diffs)

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

@@ -17 +17 @@
  * @since {@internal Unknown}}
  */
-function bp_core_admin_dashboard() { ?>
+function bp_core_admin_dashboard() { 
+    $base_url = bp_core_do_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' );
+    
+    $action = add_query_arg( array( 'page' => 'bp-general-settings' ), $base_url );
+    ?>
     <div class="wrap" id="bp-admin">
 
@@ -27 +31 @@
         <?php do_action( 'bp_admin_notices' ); ?>
 
-        <form action="<?php echo network_admin_url( 'admin.php?page=bp-general-settings' ) ?>" method="post" id="bp-admin-form">
+        <form action="<?php echo $action ?>" method="post" id="bp-admin-form">
             <div id="bp-admin-content">
                 <p>[TODO: All sorts of awesome things will go here. Latest plugins and themes, stats, version check, support topics, news, tips]</p>
@@ -194 +198 @@
         }
 
-        wp_redirect( network_admin_url( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), 'admin.php' ) ) );
+        $base_url = bp_core_do_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' );
+
+        wp_redirect( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), $base_url ) );
     }
 }
@@ -357 +363 @@
     global $bp;
     
-    if ( !bp_is_root_blog() ) {
-        $bp->is_switched = 1;
-        switch_to_blog( BP_ROOT_BLOG );
-    }
-        
     // Get the existing WP pages
     $existing_pages = bp_core_get_page_meta();
@@ -449 +450 @@
 
     <?php
-    
-    if ( isset( $bp->is_switched ) ) {
-        restore_current_blog();
-        unset( $bp->is_switched );
-    }
 }