Changeset 13192 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

Timestamp:

02/09/2024 02:19:41 AM (12 months ago)

Author:

dd32

Message:

Plugin Directory: Register plugin_tags and plugin_contributors taxonomies first.

This helps with template routing, as it ensures they're returned by get_queried_object() in preference to other taxonomies.

See #7430.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -137 +137 @@
     /**
      * Set up the Plugin Directory.
+     *
+     * NOTE: The order of the taxonomy register calls defines which one will be
+     *       returned by get_queried_object() for a multi-taxonomy query.
      */
     public function init() {
@@ -220 +223 @@
         ) );
 
-        register_taxonomy( 'plugin_built_for', 'plugin', array(
-            'hierarchical'      => true, /* for tax_input[] handling on post saves. */
-            'query_var'         => 'plugin_built_for',
-            'rewrite'           => false,
+        /*
+         * Register before other taxonomies.
+         * This ensures that it'll be returned by get_queried_object() in a multi-tax query.
+         */
+        register_taxonomy( 'plugin_tags', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
+            'hierarchical'      => false,
+            'query_var'         => 'plugin_tags',
+            'rewrite'           => array(
+                'hierarchical' => false,
+                'slug'         => 'tags',
+                'with_front'   => false,
+                'ep_mask'      => EP_TAGS,
+            ),
             'labels'            => array(
-                'name' => __( 'Built For', 'wporg-plugins' ),
+                'name'          => __( 'Plugin Tags', 'wporg-plugins' ),
+                'singular_name' => __( 'Plugin Tag', 'wporg-plugins' ),
+                'edit_item'     => __( 'Edit Tag', 'wporg-plugins' ),
+                'update_item'   => __( 'Update Tag', 'wporg-plugins' ),
+                'add_new_item'  => __( 'Add New Tag', 'wporg-plugins' ),
+                'new_item_name' => __( 'New Tag Name', 'wporg-plugins' ),
+                'search_items'  => __( 'Search Tags', 'wporg-plugins' ),
             ),
             'public'            => true,
-            'show_ui'           => false,
-            'show_admin_column' => false,
+            'show_ui'           => true,
+            'show_admin_column' => true,
             'meta_box_cb'       => false,
             'capabilities'      => array(
-                'assign_terms' => 'plugin_set_category',
-            ),
-        ) );
-
-        register_taxonomy( 'plugin_business_model', 'plugin', array(
-            'hierarchical'      => true, /* for tax_input[] handling on post saves. */
-            'query_var'         => 'plugin_business_model',
-            'rewrite'           => false,
-            'labels'            => array(
-                'name' => __( 'Business Model', 'wporg-plugins' ),
-            ),
-            'public'            => true,
-            'show_ui'           => true,
-            'show_admin_column' => false,
-            'capabilities'      => array(
-                'assign_terms' => 'plugin_set_category',
-            ),
-        ) );
-
+                'assign_terms' => 'do_not_allow',
+            ),
+        ) );
+
+        // Next, Contributors as this is the taxonomy used for `/author/xxxxxx/`
         register_taxonomy( 'plugin_contributors', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
             'hierarchical'      => false,
@@ -268 +272 @@
         ) );
 
+        // Meta-data taxonomies can follow, these will always end up being used as query parameters in URLs.
+        register_taxonomy( 'plugin_built_for', 'plugin', array(
+            'hierarchical'      => true, /* for tax_input[] handling on post saves. */
+            'query_var'         => 'plugin_built_for',
+            'rewrite'           => false,
+            'labels'            => array(
+                'name' => __( 'Built For', 'wporg-plugins' ),
+            ),
+            'public'            => true,
+            'show_ui'           => false,
+            'show_admin_column' => false,
+            'meta_box_cb'       => false,
+            'capabilities'      => array(
+                'assign_terms' => 'plugin_set_category',
+            ),
+        ) );
+
+        register_taxonomy( 'plugin_business_model', 'plugin', array(
+            'hierarchical'      => true, /* for tax_input[] handling on post saves. */
+            'query_var'         => 'plugin_business_model',
+            'rewrite'           => false,
+            'labels'            => array(
+                'name' => __( 'Business Model', 'wporg-plugins' ),
+            ),
+            'public'            => true,
+            'show_ui'           => true,
+            'show_admin_column' => false,
+            'capabilities'      => array(
+                'assign_terms' => 'plugin_set_category',
+            ),
+        ) );
+
         register_taxonomy( 'plugin_committers', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
             'hierarchical'      => false,
@@ -295 +331 @@
             'show_ui'           => true,
             'show_admin_column' => true,
-            'capabilities'      => array(
-                'assign_terms' => 'do_not_allow',
-            ),
-        ) );
-
-        register_taxonomy( 'plugin_tags', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
-            'hierarchical'      => false,
-            'query_var'         => 'plugin_tags',
-            'rewrite'           => array(
-                'hierarchical' => false,
-                'slug'         => 'tags',
-                'with_front'   => false,
-                'ep_mask'      => EP_TAGS,
-            ),
-            'labels'            => array(
-                'name'          => __( 'Plugin Tags', 'wporg-plugins' ),
-                'singular_name' => __( 'Plugin Tag', 'wporg-plugins' ),
-                'edit_item'     => __( 'Edit Tag', 'wporg-plugins' ),
-                'update_item'   => __( 'Update Tag', 'wporg-plugins' ),
-                'add_new_item'  => __( 'Add New Tag', 'wporg-plugins' ),
-                'new_item_name' => __( 'New Tag Name', 'wporg-plugins' ),
-                'search_items'  => __( 'Search Tags', 'wporg-plugins' ),
-            ),
-            'public'            => true,
-            'show_ui'           => true,
-            'show_admin_column' => true,
-            'meta_box_cb'       => false,
             'capabilities'      => array(
                 'assign_terms' => 'do_not_allow',