Ticket #6592: 6592-customizer-on-root-blog-1.patch

src/bp-core/bp-core-admin.php

@@ -141 +141 @@
                 add_action( 'bp_admin_head',            array( $this, 'admin_head'  ), 999 );
 
                 // Add menu item to settings menu.
-                add_action( bp_core_admin_hook(),       array( $this, 'admin_menus' ), 5 );
+                add_action( bp_core_admin_hook(),       array( $this, 'contextual_admin_menus' ), 5 );
+                add_action( 'admin_menu',               array( $this, 'admin_menus' ), 5 );
 
                 // Enqueue all admin JS and CSS.
                 add_action( 'bp_admin_enqueue_scripts', array( $this, 'admin_register_styles' ), 1 );
@@ -181 +182 @@
         }
 
         /**
-         * Add the navigational menu elements.
+         * Add the navigational menu elements to site admin screens.
          *
          * @since 1.6.0
-         *
-         * @uses add_management_page() To add the Recount page in Tools section.
-         * @uses add_options_page() To add the Forums settings page in Settings
-         *       section.
+         * @since 2.5.0 Function duplicated and renamed to contextual_admin_menus().
+         *              New implementation hooked to 'admin_menu'.
          */
         public function admin_menus() {
 
@@ -196 +195 @@
                         return;
                 }
 
+                $hooks = array();
+
+                if ( bp_is_root_blog() ) {
+                        // Emails
+                        $hooks[] = add_theme_page(
+                                _x( 'Emails', 'screen heading', 'buddypress' ),
+                                _x( 'Emails', 'screen heading', 'buddypress' ),
+                                $this->capability,
+                                'bp-emails-customizer-redirect',
+                                'bp_email_redirect_to_customizer'
+                        );
+                }
+
+                foreach( $hooks as $hook ) {
+                        add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
+                }
+        }
+
+        /**
+         * Register nav menus in appropiate admin screens.
+         *
+         * This function uses bp_core_admin_hook() to hook to network admin screens, or site admin screens,
+         * depending on current BuddyPress configuration.
+         *
+         * @since 2.5.0
+         */
+        public function contextual_admin_menus() {
+
                 // About.
                 add_dashboard_page(
                         __( 'Welcome to BuddyPress',  'buddypress' ),
@@ -299 +326 @@
                         'bp_core_admin_tools'
                 );
 
-                $hooks[] = add_theme_page(
-                        _x( 'Emails', 'screen heading', 'buddypress' ),
-                        _x( 'Emails', 'screen heading', 'buddypress' ),
-                        $this->capability,
-                        'bp-emails-customizer-redirect',
-                        'bp_email_redirect_to_customizer'
-                );
-
                 foreach( $hooks as $hook ) {
                         add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
                 }