Ticket #16125: 16125.diff

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

@@ -74 +74 @@
          */
         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
+                $instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+                echo '<p><label for="' . $this->get_field_id( 'title' ) .'">' . __( 'Title:' ) . '</label>
+                        <input type="text" class="widefat" id="' . $this->get_field_id( 'title' ) .'" name="' . $this->get_field_name( 'title' ) .'" value="' . $instance['title'] .'" />
+                </p>';
+
+                $taxonomies = get_taxonomies( array( 'show_tagcloud' => true ), 'object' );
+
+                switch ( count( $taxonomies ) ) {
+
+                // No tag cloud supporting taxonomies found, display error message
+                case 0:
+                        echo '<p>' . __( 'The tag cloud would not be displayed since their are no taxonomies that support the tag cloud widget.' ) . '</p>';
+                        echo '<input type="hidden" id="' . $this->get_field_id( 'taxonomy' ) . '" name="' . $this->get_field_name( 'taxonomy' ) . '" value="" />';
+                        break;
+
+                // Just a single tag cloud supporting taxonomy found, no need to display options
+                case 1:
+                        $taxonomy = array_pop( array_keys( $taxonomies ) );
+                        echo '<input type="hidden" id="' . $this->get_field_id( 'taxonomy' ) . '" name="' . $this->get_field_name( 'taxonomy' ) . '" value="' . esc_attr( $taxonomy ) . '" />';
+                        break;
+
+                // More than one tag cloud supporting taxonomy found, display options
+                default:
+                        echo '<p><label for="' . $this->get_field_id( 'taxonomy' ) . '">' . __( 'Taxonomy:' ) . '</label>
+                                <select class="widefat" id="' . $this->get_field_id( 'taxonomy' ) . '" name="' . $this->get_field_name( 'taxonomy' ) .'">';
+
+                        foreach ( $taxonomies as $taxonomy => $tax ) {
+                                echo '<option value="' . esc_attr( $taxonomy ) . '"' . selected( $taxonomy, $current_taxonomy, false ) .'>' . $tax->labels->name .'</option>';
+                        }
+
+                        echo '</select></p>';
+                }
         }
 
         /**