Changeset 36525 for trunk/src/wp-includes/taxonomy.php

Timestamp:

02/13/2016 03:50:37 AM (9 years ago)

Author:

boonebgorges

Message:

Introduce publicly_queryable taxonomy argument.

Taxonomies registered as publicly_queryable can be queried as taxonomy
archives.

If not provided explicitly, the value of publicly_queryable is inherited
from public.

Props Chouby.
Fixes #34491.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (3 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -289 +289 @@
  *                                                Default empty array.
  *     @type string        $description           A short descriptive summary of what the taxonomy is for. Default empty.
- *     @type bool          $public                Whether the taxonomy is publicly queryable. Default true.
+ *     @type bool          $public                Whether a taxonomy is intended for use publicly either via
+ *                                                the admin interface or by front-end users. The default settings
+ *                                                of `$publicly_queryable`, `$show_ui`, and `$show_in_nav_menus`
+ *                                                are inherited from `$public`.
+ *     @type bool          $publicly_queryable    Whether the taxonomy is publicly queryable.
+ *                                                If not set, the default is inherited from `$public`
  *     @type bool          $hierarchical          Whether the taxonomy is hierarchical. Default false.
  *     @type bool          $show_ui               Whether to generate and allow a UI for managing terms in this taxonomy in
@@ -363 +368 @@
         'description'           => '',
         'public'                => true,
+        'publicly_queryable'    => null,
         'hierarchical'          => false,
         'show_ui'               => null,
@@ -384 +390 @@
     }
 
-    // Non-public taxonomies should not register query vars, except in the admin.
-    if ( false !== $args['query_var'] && ( is_admin() || false !== $args['public'] ) && ! empty( $wp ) ) {
+    // If not set, default to the setting for public.
+    if ( null === $args['publicly_queryable'] ) {
+        $args['publicly_queryable'] = $args['public'];
+    }
+
+    // Non-publicly queryable taxonomies should not register query vars, except in the admin.
+    if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) {
         if ( true === $args['query_var'] )
             $args['query_var'] = $taxonomy;