Ticket #16125: tagcloud.v3.diff

default-widgets.php

@@ -992 +992 @@
 class WP_Widget_Tag_Cloud extends WP_Widget {
 
         function __construct() {
-                $widget_ops = array( 'description' => __( "Your most used tags in cloud format") );
-                parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
+                $widget_ops = array( 'description' => __( 'Your most used tags in cloud format' ) );
+                parent::__construct( 'tag_cloud', __( 'Tag Cloud' ), $widget_ops );
         }
 
         function widget( $args, $instance ) {
-                extract($args);
-                $current_taxonomy = $this->_get_current_taxonomy($instance);
-                if ( !empty($instance['title']) ) {
+                extract( $args );
+                $current_taxonomy = $this->_get_current_taxonomy( $instance );
+
+                if ( ! taxonomy_exists( $current_taxonomy ) )
+                        return;
+
+                if ( ! empty( $instance['title'] ) ) {
                         $title = $instance['title'];
                 } else {
                         if ( 'post_tag' == $current_taxonomy ) {
-                                $title = __('Tags');
+                                $title = __( 'Tags' );
                         } else {
-                                $tax = get_taxonomy($current_taxonomy);
+                                $tax   = get_taxonomy( $current_taxonomy );
                                 $title = $tax->labels->name;
                         }
                 }
-                $title = apply_filters('widget_title', $title, $instance, $this->id_base);
+                $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
                 echo $before_widget;
                 if ( $title )
                         echo $before_title . $title . $after_title;
                 echo '<div class="tagcloud">';
-                wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
+                wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array( 'taxonomy' => $current_taxonomy ) ) );
                 echo "</div>\n";
                 echo $after_widget;
         }
 
         function update( $new_instance, $old_instance ) {
-                $instance['title'] = strip_tags(stripslashes($new_instance['title']));
-                $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
+                $instance['title']    = strip_tags( stripslashes( $new_instance['title'] ) );
+                $instance['taxonomy'] = stripslashes( $new_instance['taxonomy'] );
                 return $instance;
         }
 
         function form( $instance ) {
-                $current_taxonomy = $this->_get_current_taxonomy($instance);
-?>
-        <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 if (isset ( $instance['title'])) {echo esc_attr( $instance['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_object_taxonomies('post') 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 $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>';
+
+                $current_taxonomy = $this->_get_current_taxonomy( $instance );
+                $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>';
+                }
+
         }
 
-        function _get_current_taxonomy($instance) {
-                if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
+        function _get_current_taxonomy( $instance ) {
+                if ( ! empty( $instance['taxonomy'] ) && taxonomy_exists( $instance['taxonomy'] ) )
                         return $instance['taxonomy'];
 
-                return 'post_tag';
+                return false;
         }
 }