Changeset 11110

Timestamp:

09/17/2016 04:54:21 PM (9 years ago)

Author:

dcavins

Message:

Member Types: Use helper function for taxonomy name.

Allows the member type taxonomy name to be filtered.

Props slaFFik, dcavins.

See #6060.

Location:

trunk

Files:

• src/bp-core/bp-core-taxonomy.php (modified) (1 diff)
• src/bp-core/classes/class-bp-user-query.php (modified) (2 diffs)
• src/bp-members/bp-members-cache.php (modified) (1 diff)
• src/bp-members/bp-members-functions.php (modified) (4 diffs)
• tests/phpunit/testcases/members/types.php (modified) (3 diffs)

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

@@ -22 +22 @@
 function bp_register_default_taxonomies() {
     // Member Type.
-    register_taxonomy( 'bp_member_type', 'user', array(
+    register_taxonomy( bp_get_member_type_tax_name(), 'user', array(
         'public' => false,
     ) );

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

@@ -788 +788 @@
         $tax_query = new WP_Tax_Query( array(
             array(
-                'taxonomy' => 'bp_member_type',
+                'taxonomy' => bp_get_member_type_tax_name(),
                 'field'    => 'name',
                 'operator' => $operator,
@@ -796 +796 @@
 
         // Switch to the root blog, where member type taxonomies live.
-        $site_id  = bp_get_taxonomy_term_site_id( 'bp_member_type' );
+        $site_id  = bp_get_taxonomy_term_site_id( bp_get_member_type_tax_name() );
         $switched = false;
         if ( $site_id !== get_current_blog_id() ) {

trunk/src/bp-members/bp-members-cache.php

@@ -21 +21 @@
     $uncached_member_ids = bp_get_non_cached_ids( $bp_user_query->user_ids, 'bp_member_member_type' );
 
-    $member_types = bp_get_object_terms( $uncached_member_ids, 'bp_member_type', array(
+    $member_types = bp_get_object_terms( $uncached_member_ids, bp_get_member_type_tax_name(), array(
         'fields' => 'all_with_object_id',
     ) );

trunk/src/bp-members/bp-members-functions.php

@@ -2507 +2507 @@
 
 /**
+ * Output the slug of the member type taxonomy.
+ *
+ * @since 2.7.0
+ */
+function bp_member_type_tax_name() {
+    echo bp_get_member_type_tax_name();
+}
+
+    /**
+     * Return the slug of the member type taxonomy.
+     *
+     * @since 2.7.0
+     *
+     * @return string The unique member taxonomy slug.
+     */
+    function bp_get_member_type_tax_name() {
+        /**
+         * Filters the slug of the member type taxonomy.
+         *
+         * @since 2.7.0
+         *
+         * @param string $value Member type taxonomy slug.
+         */
+        return apply_filters( 'bp_get_member_type_tax_name', 'bp_member_type' );
+    }
+
+/**
  * Register a member type.
  *
@@ -2677 +2704 @@
     }
 
-    $retval = bp_set_object_terms( $user_id, $member_type, 'bp_member_type', $append );
+    $retval = bp_set_object_terms( $user_id, $member_type, bp_get_member_type_tax_name(), $append );
 
     // Bust the cache if the type has been updated.
@@ -2713 +2740 @@
     }
 
-    $deleted = bp_remove_object_terms( $user_id, $member_type, 'bp_member_type' );
+    $deleted = bp_remove_object_terms( $user_id, $member_type, bp_get_member_type_tax_name() );
 
     // Bust the cache if the type has been removed.
@@ -2748 +2775 @@
 
     if ( false === $types ) {
-        $raw_types = bp_get_object_terms( $user_id, 'bp_member_type' );
+        $raw_types = bp_get_object_terms( $user_id, bp_get_member_type_tax_name() );
 
         if ( ! is_wp_error( $raw_types ) ) {

trunk/tests/phpunit/testcases/members/types.php

@@ -286 +286 @@
 
         // Fetch a term ID.
-        $terms = get_terms( 'bp_member_type', array( 'hide_empty' => false, 'fields' => 'all' ) );
+        $terms = get_terms( bp_get_member_type_tax_name(), array( 'hide_empty' => false, 'fields' => 'all' ) );
 
         // Make sure the user's ID matches a term ID, to force a cache confusion.
@@ -296 +296 @@
 
         // Reprime the taxonomy cache.
-        $terms = get_terms( 'bp_member_type', array( 'hide_empty' => false, 'fields' => 'all' ) );
+        $terms = get_terms( bp_get_member_type_tax_name(), array( 'hide_empty' => false, 'fields' => 'all' ) );
 
         $this->assertSame( 'foo', bp_get_member_type( $new_user_id, true ) );
@@ -400 +400 @@
 
         // Directly set a type that hasn't been registered.
-        bp_set_object_terms( $u1, 'ugh', 'bp_member_type', true );
+        bp_set_object_terms( $u1, 'ugh', bp_get_member_type_tax_name(), true );
 
         $type = bp_get_member_type( $u1, false );