Ticket #6592: 6592-register-post-type-on-rootblog-only.patch

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

@@ -143 +143 @@
                 // Add menu item to settings menu.
                 add_action( bp_core_admin_hook(),       array( $this, 'admin_menus' ), 5 );
 
+                // Add Menu for the Customizer Email
+                add_action( 'admin_menu', array( $this, 'customizer_menu' ) );
+
                 // Enqueue all admin JS and CSS.
                 add_action( 'bp_admin_enqueue_scripts', array( $this, 'admin_register_styles' ), 1 );
                 add_action( 'bp_admin_enqueue_scripts', array( $this, 'admin_register_scripts' ), 1 );
@@ -299 +302 @@
                         'bp_core_admin_tools'
                 );
 
-                $hooks[] = add_theme_page(
+                foreach( $hooks as $hook ) {
+                        add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
+                }
+        }
+
+        /**
+         * Add the navigational elements for the customizer
+         *
+         * @since 2.5.0
+         */
+        public function customizer_menu() {
+                // Only add the customizer menu for the root blog
+                if ( ! bp_is_root_blog() ) {
+                        return;
+                }
+
+                // Emails
+                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' );
-                }
         }
 
         /**

src/bp-core/bp-core-loader.php

@@ -292 +292 @@
          * @since BuddyPress (2.4.0)
          */
         public function register_post_types() {
-
-                // Emails
-                register_post_type(
-                        bp_get_email_post_type(),
-                        apply_filters( 'bp_register_email_post_type', array(
-                                'description'       => _x( 'BuddyPress emails', 'email post type description', 'buddypress' ),
-                                'labels'            => bp_get_email_post_type_labels(),
-                                'menu_icon'         => 'dashicons-email',
-                                'public'            => false,
-                                'publicly_queryable' => bp_current_user_can( 'bp_moderate' ),
-                                'query_var'         => false,
-                                'rewrite'           => false,
-                                'show_in_admin_bar' => false,
-                                'show_ui'           => bp_current_user_can( 'bp_moderate' ),
-                                'supports'          => bp_get_email_post_type_supports(),
-                        ) )
-                );
+                // Make sure BuddyPress Post Types are only registered for the root blog
+                if ( bp_is_root_blog() ) {
+                        // Emails
+                        register_post_type(
+                                bp_get_email_post_type(),
+                                apply_filters( 'bp_register_email_post_type', array(
+                                        'description'       => _x( 'BuddyPress emails', 'email post type description', 'buddypress' ),
+                                        'labels'            => bp_get_email_post_type_labels(),
+                                        'menu_icon'         => 'dashicons-email',
+                                        'public'            => false,
+                                        'publicly_queryable' => bp_current_user_can( 'bp_moderate' ),
+                                        'query_var'         => false,
+                                        'rewrite'           => false,
+                                        'show_in_admin_bar' => false,
+                                        'show_ui'           => bp_current_user_can( 'bp_moderate' ),
+                                        'supports'          => bp_get_email_post_type_supports(),
+                                ) )
+                        );
+                }
 
                 parent::register_post_types();
         }