Changeset 43386

Timestamp:

07/03/2018 10:28:39 AM (4 years ago)

Author:

flixos90

Message:

Taxonomy: Introduce is_taxonomy_viewable().

This utility function allows for easy detection whether terms for a taxonomy are considered publicly viewable.

Props andizer.
Fixes #44466.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-terms-list-table.php (modified) (1 diff)
• src/wp-includes/admin-bar.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/taxonomy/isTaxonomyViewable.php (added)

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -471 +471 @@
             );
         }
-        if ( $tax->public ) {
+        if ( is_taxonomy_viewable( $tax ) ) {
             $actions['view'] = sprintf(
                 '<a href="%s" aria-label="%s">%s</a>',

trunk/src/wp-includes/admin-bar.php

@@ -729 +729 @@
             && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
             && ( $tax = get_taxonomy( $tag->taxonomy ) )
-            && $tax->public ) {
+            && is_taxonomy_viewable( $tax ) ) {
             $wp_admin_bar->add_menu(
                 array(

trunk/src/wp-includes/taxonomy.php

@@ -4549 +4549 @@
     return $parent;
 }
+
+/**
+ * Determines whether a taxonomy is considered "viewable".
+ *
+ * @since 5.0.0
+ *
+ * @param string|WP_Taxonomy $taxonomy Taxonomy name or object.
+ * @return bool Whether the taxonomy should be considered viewable.
+ */
+function is_taxonomy_viewable( $taxonomy ) {
+    if ( is_scalar( $taxonomy ) ) {
+        $taxonomy = get_taxonomy( $taxonomy );
+        if ( ! $taxonomy ) {
+            return false;
+        }
+    }
+
+    return $taxonomy->publicly_queryable;
+}