Changeset 10536

Timestamp:

02/06/2016 01:11:09 AM (10 years ago)

Author:

djpaul

Message:

Emails: only register post type and taxonomy on root site.

Prevent the post type appearing on non-root site wp-admin screen in a
network-activated multisite configuration, while retaining single-site
and multiblog compatibility.

A subsequent change will add support for these items to the network
admin for network-activated multisite configuration.

See #6592

Location:

trunk/src/bp-core

Files:

• bp-core-taxonomy.php (modified) (1 diff)
• classes/class-bp-core.php (modified) (1 diff)

trunk/src/bp-core/bp-core-taxonomy.php

@@ -27 +27 @@
 
         // Email type.
-        register_taxonomy(
-                bp_get_email_tax_type(),
-                bp_get_email_post_type(),
-                apply_filters( 'bp_register_email_tax_type', array(
-                        'description'   => _x( 'BuddyPress email types', 'email type taxonomy description', 'buddypress' ),
-                        'labels'        => bp_get_email_tax_type_labels(),
-                        'meta_box_cb'   => 'bp_email_tax_type_metabox',
-                        'public'        => false,
-                        'query_var'     => false,
-                        'rewrite'       => false,
-                        'show_in_menu'  => false,
-                        'show_tagcloud' => false,
-                        'show_ui'       => bp_current_user_can( 'bp_moderate' ),
-                ) )
-        );
+        if ( bp_is_root_blog() && ! is_network_admin() ) {
+                register_taxonomy(
+                        bp_get_email_tax_type(),
+                        bp_get_email_post_type(),
+                        apply_filters( 'bp_register_email_tax_type', array(
+                                'description'   => _x( 'BuddyPress email types', 'email type taxonomy description', 'buddypress' ),
+                                'labels'        => bp_get_email_tax_type_labels(),
+                                'meta_box_cb'   => 'bp_email_tax_type_metabox',
+                                'public'        => false,
+                                'query_var'     => false,
+                                'rewrite'       => false,
+                                'show_in_menu'  => false,
+                                'show_tagcloud' => false,
+                                'show_ui'       => bp_current_user_can( 'bp_moderate' ),
+                        ) )
+                );
+        }
 }
 add_action( 'bp_register_taxonomies', 'bp_register_default_taxonomies' );

trunk/src/bp-core/classes/class-bp-core.php

@@ -299 +299 @@
 
                 // Emails
-                if ( bp_is_root_blog() ) {
+                if ( bp_is_root_blog() && ! is_network_admin() ) {
                         register_post_type(
                                 bp_get_email_post_type(),