Changeset 34273 for trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php

Timestamp:

09/17/2015 10:10:46 PM (9 years ago)

Author:

wonderboymusic

Message:

Widgets: don't show a dropdown if there is only 1 taxonomy or zero taxonomies available to the Tag Cloud widget form. Don't output the widget if there are no terms in the selected taxonomy.

Props GautamGupta, wonderboymusic.
Fixes #16125.

File:

• trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php (modified) (3 diffs)

trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php

@@ -31 +31 @@
         }
 
-        /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-        $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
-
-        echo $args['before_widget'];
-        if ( $title ) {
-            echo $args['before_title'] . $title . $args['after_title'];
-        }
-        echo '<div class="tagcloud">';
-
         /**
          * Filter the taxonomy used in the Tag Cloud widget.
@@ -50 +41 @@
          * @param array $current_taxonomy The taxonomy to use in the tag cloud. Default 'tags'.
          */
-        wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array(
-            'taxonomy' => $current_taxonomy
+        $tag_cloud = wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array(
+            'taxonomy' => $current_taxonomy,
+            'echo' => false
         ) ) );
+
+        if ( empty( $tag_cloud ) ) {
+            return;
+        }
+
+        /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+        $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+        echo $args['before_widget'];
+        if ( $title ) {
+            echo $args['before_title'] . $title . $args['after_title'];
+        }
+
+        echo '<div class="tagcloud">';
+
+        echo $tag_cloud;
 
         echo "</div>\n";
@@ -75 +83 @@
     public function form( $instance ) {
         $current_taxonomy = $this->_get_current_taxonomy($instance);
-        $title = isset( $instance['title'] ) ? $instance['title'] : '';
-?>
-    <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
-    <input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr( $title ); ?>" /></p>
-    <p><label for="<?php echo $this->get_field_id('taxonomy'); ?>"><?php _e('Taxonomy:') ?></label>
-    <select class="widefat" id="<?php echo $this->get_field_id('taxonomy'); ?>" name="<?php echo $this->get_field_name('taxonomy'); ?>">
-    <?php foreach ( get_taxonomies() as $taxonomy ) :
-        $tax = get_taxonomy($taxonomy);
-        if ( !$tax->show_tagcloud || empty($tax->labels->name) )
-            continue;
-    ?>
-        <option value="<?php echo esc_attr($taxonomy) ?>" <?php selected($taxonomy, $current_taxonomy) ?>><?php echo esc_attr( $tax->labels->name ); ?></option>
-    <?php endforeach; ?>
-    </select></p><?php
+        $title_id = $this->get_field_id( 'title' );
+        $instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+
+        echo '<p><label for="' . $title_id .'">' . __( 'Title:' ) . '</label>
+            <input type="text" class="widefat" id="' . $title_id .'" name="' . $this->get_field_name( 'title' ) .'" value="' . $instance['title'] .'" />
+        </p>';
+
+        $taxonomies = get_taxonomies( array( 'show_tagcloud' => true ), 'object' );
+        $id = $this->get_field_id( 'taxonomy' );
+        $name = $this->get_field_name( 'taxonomy' );
+        $input = '<input type="hidden" id="' . $id . '" name="' . $name . '" value="%s" />';
+
+        switch ( count( $taxonomies ) ) {
+
+        // No tag cloud supporting taxonomies found, display error message
+        case 0:
+            echo '<p>' . __( 'The tag cloud will not be displayed since their are no taxonomies that support the tag cloud widget.' ) . '</p>';
+            printf( $input, '' );
+            break;
+
+        // Just a single tag cloud supporting taxonomy found, no need to display options
+        case 1:
+            $keys = array_keys( $taxonomies );
+            $taxonomy = reset( $keys );
+            printf( $input, esc_attr( $taxonomy ) );
+            break;
+
+        // More than one tag cloud supporting taxonomy found, display options
+        default:
+            printf(
+                '<p><label for="%1$s">%2$s</label>' .
+                '<select class="widefat" id="%1$s" name="%3$s">',
+                $id,
+                __( 'Taxonomy:' ),
+                $name
+            );
+
+            foreach ( $taxonomies as $taxonomy => $tax ) {
+                printf(
+                    '<option value="%s"%s>%s</option>',
+                    esc_attr( $taxonomy ),
+                    selected( $taxonomy, $current_taxonomy, false ),
+                    $tax->labels->name
+                );
+            }
+
+            echo '</select></p>';
+        }
     }