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

trunk/bp-core/bp-core-functions.php

@@ -160 +160 @@
 }
 
+function bp_core_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_admin_hook() {
+        $hook = bp_core_do_network_admin() ? 'network_admin_menu' : 'admin_menu';
+        
+        return apply_filters( 'bp_core_admin_hook', $hook );
+}
+
 /**
  * Initializes the wp-admin area "BuddyPress" menus and sub menus.
@@ -169 +184 @@
         if ( !is_super_admin() )
                 return false;
+        
+        add_action( bp_core_admin_hook(), 'bp_core_add_admin_menu', 9 );
 
         require ( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-admin.php' );
 }
-add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_admin_menu_init' );
+add_action( 'bp_init', 'bp_core_admin_menu_init' );
 
 /**
@@ -194 +211 @@
 
         // Add the administration tab under the "Site Admin" tab for site administrators
-        $hooks[] = add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup', '', 2 );
+        $hooks[] = add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup', '', 4 );
 
         $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Components', 'buddypress' ), __( 'Components', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup'  );
@@ -203 +220 @@
                 add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
 }
-add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu', 9 );
 
 /**
@@ -225 +241 @@
                 return;
         
-        // On multisite installs, don't show on the Site Admin of a non-root blog
-        if ( !bp_is_root_blog() )
+        // On multisite installs, don't show on the Site Admin of a non-root blog, unless
+        // do_network_admin is overridden
+        if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() )
                 return;
                 
@@ -284 +301 @@
         if ( !is_super_admin() )
                 return;
-        
-        // On multisite installs, don't log on a non-root blog
-        if ( !bp_is_root_blog() )
+                
+        // On multisite installs, don't load on a non-root blog, unless do_network_admin is
+        // overridden
+        if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() )
                 return;
                 
@@ -361 +379 @@
                 }
                 
-                $notice = sprintf( __( 'Some of your WordPress pages are linked to BuddyPress components that have been disabled. These pages may continue to show up in your site navigation. Consider <a href="%1$s">reactivating the components</a>, or unpublishing the pages: <strong>%2$s</strong>', 'buddypress' ), network_admin_url( 'admin.php?page=bp-general-settings' ), implode( ', ', $edit_pages_links ) );
+                $admin_url = bp_core_do_network_admin() ? network_admin_url( 'admin.php?page=bp-general-settings' ) : admin_url( 'admin.php?page=bp-general-settings' );
+                
+                $notice = sprintf( __( 'Some of your WordPress pages are linked to BuddyPress components that have been disabled. These pages may continue to show up in your site navigation. Consider <a href="%1$s">reactivating the components</a>, or unpublishing the pages: <strong>%2$s</strong>', 'buddypress' ), $admin_url, implode( ', ', $edit_pages_links ) );
                 
                 bp_core_add_admin_notice( $notice );
@@ -404 +424 @@
         
         if ( !empty( $orphaned_components ) ) {
-                $notice = sprintf( __( 'Some BuddyPress components must be associated with WordPress pages for your site to work properly. The following components are missing their required WP pages: <strong>%1$s</strong>. Visit the <a href="%2$s">BuddyPress Components</a> panel, where you can either deactivate unused components or complete the page setup.', 'buddypress' ), implode( ', ', $orphaned_components ), network_admin_url( 'admin.php?page=bp-general-settings' ) );
+                $admin_url = bp_core_do_network_admin() ? network_admin_url( 'admin.php?page=bp-general-settings' ) : admin_url( 'admin.php?page=bp-general-settings' );
+                
+                $notice = sprintf( __( 'Some BuddyPress components must be associated with WordPress pages for your site to work properly. The following components are missing their required WP pages: <strong>%1$s</strong>. Visit the <a href="%2$s">BuddyPress Components</a> panel, where you can either deactivate unused components or complete the page setup.', 'buddypress' ), implode( ', ', $orphaned_components ), $admin_url );
                 
                 bp_core_add_admin_notice( $notice );