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

Timestamp:

04/17/2020 09:36:25 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Format the markup of widget forms in a more consistent manner.

See #49542.

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

@@ -125 +125 @@
      */
     public function form( $instance ) {
-        $current_taxonomy  = $this->_get_current_taxonomy( $instance );
-        $title_id          = $this->get_field_id( 'title' );
-        $count             = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
-        $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" />';
-
-        $count_checkbox = sprintf(
-            '<p><input type="checkbox" class="checkbox" id="%1$s" name="%2$s"%3$s /> <label for="%1$s">%4$s</label></p>',
-            $this->get_field_id( 'count' ),
-            $this->get_field_name( 'count' ),
-            checked( $count, true, false ),
-            __( 'Show tag counts' )
-        );
+        $title = ! empty( $instance['title'] ) ? $instance['title'] : '';
+        $count = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
+        ?>
+        <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>
+        <?php
+        $taxonomies       = get_taxonomies( array( 'show_tagcloud' => true ), 'object' );
+        $current_taxonomy = $this->_get_current_taxonomy( $instance );
 
         switch ( count( $taxonomies ) ) {
@@ -151 +140 @@
             // No tag cloud supporting taxonomies found, display error message.
             case 0:
-                echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';
-                printf( $input, '' );
+                ?>
+                <input type="hidden" id="<?php echo $this->get_field_id( 'taxonomy' ); ?>" name="<?php echo $this->get_field_name( 'taxonomy' ); ?>" value="" />
+                <p>
+                    <?php _e( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ); ?>
+                </p>
+                <?php
                 break;
 
@@ -159 +152 @@
                 $keys     = array_keys( $taxonomies );
                 $taxonomy = reset( $keys );
-                printf( $input, esc_attr( $taxonomy ) );
-                echo $count_checkbox;
+                ?>
+                <input type="hidden" id="<?php echo $this->get_field_id( 'taxonomy' ); ?>" name="<?php echo $this->get_field_name( 'taxonomy' ); ?>" value="<?php echo esc_attr( $taxonomy ); ?>" />
+                <?php
                 break;
 
             // More than one tag cloud supporting taxonomy found, display a select.
             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>' . $count_checkbox;
+                ?>
+                <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 ( $taxonomies as $taxonomy => $tax ) : ?>
+                        <option value="<?php echo esc_attr( $taxonomy ); ?>" <?php selected( $taxonomy, $current_taxonomy ); ?>>
+                            <?php echo esc_html( $tax->labels->name ); ?>
+                        </option>
+                    <?php endforeach; ?>
+                    </select>
+                </p>
+                <?php
+        }
+
+        if ( count( $taxonomies ) > 0 ) {
+            ?>
+            <p>
+                <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" <?php checked( $count, true ); ?> />
+                <label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Show tag counts' ); ?></label>
+            </p>
+            <?php
         }
     }