Changeset 42343 for trunk/src/wp-includes/widgets/class-wp-widget-categories.php

Timestamp:

11/30/2017 11:09:33 PM (8 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/widgets/class-wp-widget-categories.php (modified) (5 diffs)

trunk/src/wp-includes/widgets/class-wp-widget-categories.php

@@ -24 +24 @@
     public function __construct() {
         $widget_ops = array(
-            'classname' => 'widget_categories',
-            'description' => __( 'A list or dropdown of categories.' ),
+            'classname'                   => 'widget_categories',
+            'description'                 => __( 'A list or dropdown of categories.' ),
             'customize_selective_refresh' => true,
         );
@@ -68 +68 @@
         if ( $d ) {
             echo sprintf( '<form action="%s" method="get">', esc_url( home_url() ) );
-            $dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
+            $dropdown_id    = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
             $first_dropdown = false;
 
@@ -74 +74 @@
 
             $cat_args['show_option_none'] = __( 'Select Category' );
-            $cat_args['id'] = $dropdown_id;
+            $cat_args['id']               = $dropdown_id;
 
             /**
@@ -142 +142 @@
      */
     public function update( $new_instance, $old_instance ) {
-        $instance = $old_instance;
-        $instance['title'] = sanitize_text_field( $new_instance['title'] );
-        $instance['count'] = !empty($new_instance['count']) ? 1 : 0;
-        $instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
-        $instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
+        $instance                 = $old_instance;
+        $instance['title']        = sanitize_text_field( $new_instance['title'] );
+        $instance['count']        = ! empty( $new_instance['count'] ) ? 1 : 0;
+        $instance['hierarchical'] = ! empty( $new_instance['hierarchical'] ) ? 1 : 0;
+        $instance['dropdown']     = ! empty( $new_instance['dropdown'] ) ? 1 : 0;
 
         return $instance;
@@ -160 +160 @@
     public function form( $instance ) {
         //Defaults
-        $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-        $title = sanitize_text_field( $instance['title'] );
-        $count = isset($instance['count']) ? (bool) $instance['count'] :false;
+        $instance     = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+        $title        = sanitize_text_field( $instance['title'] );
+        $count        = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
         $hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;
-        $dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
+        $dropdown     = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
         ?>
-        <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:' ); ?></label>
-        <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
+        <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
+        <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
 
-        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
-        <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
+        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'dropdown' ); ?>" name="<?php echo $this->get_field_name( 'dropdown' ); ?>"<?php checked( $dropdown ); ?> />
+        <label for="<?php echo $this->get_field_id( 'dropdown' ); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
 
-        <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked( $count ); ?> />
-        <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e( 'Show post counts' ); ?></label><br />
+        <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>"<?php checked( $count ); ?> />
+        <label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Show post counts' ); ?></label><br />
 
-        <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> />
-        <label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
+        <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'hierarchical' ); ?>" name="<?php echo $this->get_field_name( 'hierarchical' ); ?>"<?php checked( $hierarchical ); ?> />
+        <label for="<?php echo $this->get_field_id( 'hierarchical' ); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
         <?php
     }