Changeset 6672

Timestamp:

08/28/2017 02:09:54 AM (7 years ago)

Author:

johnjamesjacoby

Message:

Core: Add source parameter to API registrations.

This change makes it easier to target bbPress-specific post types & statuses, and taxonomies. source may not be the final key, but thankfully all of these APIs accept additional keys, and if support is added to core eventually, we can easily migrate over to it without problems.

Trunk, for 2.6. See: ​https://core.trac.wordpress.org/ticket/41739

Location:

trunk/src

Files:

• bbpress.php (modified) (8 diffs)
• includes/core/template-functions.php (modified) (1 diff)
• includes/forums/functions.php (modified) (1 diff)
• includes/search/template.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -520 +520 @@
                 'hierarchical'        => true,
                 'query_var'           => true,
-                'menu_icon'           => ''
+                'menu_icon'           => '',
+                'source'              => 'bbpress',
             ) )
         );
@@ -545 +546 @@
                 'hierarchical'        => false,
                 'query_var'           => true,
-                'menu_icon'           => ''
+                'menu_icon'           => '',
+                'source'              => 'bbpress',
             )
         ) );
@@ -570 +572 @@
                 'hierarchical'        => false,
                 'query_var'           => true,
-                'menu_icon'           => ''
+                'menu_icon'           => '',
+                'source'              => 'bbpress',
             ) )
         );
@@ -593 +596 @@
                 'public'                    => true,
                 'show_in_admin_status_list' => true,
-                'show_in_admin_all_list'    => true
+                'show_in_admin_all_list'    => true,
+                'source'                    => 'bbpress'
             ) )
         );
@@ -606 +610 @@
                 'exclude_from_search'       => true,
                 'show_in_admin_status_list' => true,
-                'show_in_admin_all_list'    => false
+                'show_in_admin_all_list'    => false,
+                'source'                    => 'bbpress'
             ) )
          );
@@ -619 +624 @@
                 'exclude_from_search'       => true,
                 'show_in_admin_status_list' => true,
-                'show_in_admin_all_list'    => false
+                'show_in_admin_all_list'    => false,
+                'source'                    => 'bbpress'
             ) )
         );
@@ -632 +638 @@
                 'exclude_from_search'       => true,
                 'show_in_admin_status_list' => true,
-                'show_in_admin_all_list'    => true
+                'show_in_admin_all_list'    => true,
+                'source'                    => 'bbpress'
             ) )
         );
@@ -682 +689 @@
                 'public'                => true,
                 'show_ui'               => bbp_allow_topic_tags() && current_user_can( 'bbp_topic_tags_admin' ),
+                'source'                => 'bbpress'
             )
         ) );

trunk/src/includes/core/template-functions.php

@@ -716 +716 @@
 
     // Do topics on forums root
-    } elseif ( is_post_type_archive( array( bbp_get_forum_post_type(), bbp_get_topic_post_type() ) ) && ( 'topics' === bbp_show_on_root() ) ) {
+    } elseif ( is_post_type_archive( get_post_types( array( 'source' => 'bbpress', 'has_archive' ) ) ) && ( 'topics' === bbp_show_on_root() ) ) {
         $posts_query->bbp_show_topics_on_root = true;
     }

trunk/src/includes/forums/functions.php

@@ -2049 +2049 @@
 
     // Some other post type besides Forums, Topics, or Replies
-    } elseif ( ! array_diff( $post_types, array( bbp_get_forum_post_type(), bbp_get_topic_post_type(), bbp_get_reply_post_type() ) ) ) {
+    } elseif ( ! array_diff( $post_types, get_post_types( array( 'source' => 'bbpress' ) ) ) ) {
 
         // Get forums to exclude

trunk/src/includes/search/template.php

@@ -26 +26 @@
 
     $default_search_terms = bbp_get_search_terms();
-    $default_post_type    = array( bbp_get_forum_post_type(), bbp_get_topic_post_type(), bbp_get_reply_post_type() );
+    $default_post_types   = get_post_types( array( 'source' => 'bbpress' ) );
 
     // Default query args
     $default = array(
-        'post_type'           => $default_post_type,         // Forums, topics, and replies
+        'post_type'           => $default_post_types,        // Forums, topics, and replies
         'posts_per_page'      => bbp_get_replies_per_page(), // This many
         'paged'               => bbp_get_paged(),            // On this page