Changeset 10765

Timestamp:

05/14/2016 05:59:21 PM (9 years ago)

Author:

r-a-y

Message:

Emails: Register our email type taxonomy at all times.

Fixes an issue where attempting to use bp_get_email() / bp_send_email()
on a non-root blog would fail.

In bp_get_email(), get_posts() is used to fetch our email post type.
Since we are doing a taxonomy query in get_posts(), WP_Tax_Query::clean_query
attempts to see if our taxonomy exists. Since our taxonomy did not exist on
non-root blogs, the taxonomy SQL clauses would not be added and
bp_get_email() would fail.

See ​#WP20541 for more details.

See #7055 (trunk)

File:

• trunk/src/bp-core/bp-core-taxonomy.php (modified) (1 diff)

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

@@ -27 +27 @@
 
     // Email type.
-    if ( bp_is_root_blog() ) {
-        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' ),
-            ) )
-        );
-    }
+    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_is_root_blog() && bp_current_user_can( 'bp_moderate' ),
+        ) )
+    );
 }
 add_action( 'bp_register_taxonomies', 'bp_register_default_taxonomies' );