--- a/wp/wp-includes/widgets/class-wp-widget-categories.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/widgets/class-wp-widget-categories.php Mon Oct 14 18:28:13 2019 +0200
@@ -23,8 +23,8 @@
*/
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,
);
parent::__construct( 'categories', __( 'Categories' ), $widget_ops );
@@ -67,13 +67,13 @@
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;
echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
$cat_args['show_option_none'] = __( 'Select Category' );
- $cat_args['id'] = $dropdown_id;
+ $cat_args['id'] = $dropdown_id;
/**
* Filters the arguments for the Categories widget drop-down.
@@ -105,26 +105,26 @@
/* ]]> */
</script>
-<?php
+ <?php
} else {
-?>
+ ?>
<ul>
-<?php
- $cat_args['title_li'] = '';
+ <?php
+ $cat_args['title_li'] = '';
- /**
- * Filters the arguments for the Categories widget.
- *
- * @since 2.8.0
- * @since 4.9.0 Added the `$instance` parameter.
- *
- * @param array $cat_args An array of Categories widget options.
- * @param array $instance Array of settings for the current widget.
- */
- wp_list_categories( apply_filters( 'widget_categories_args', $cat_args, $instance ) );
-?>
+ /**
+ * Filters the arguments for the Categories widget.
+ *
+ * @since 2.8.0
+ * @since 4.9.0 Added the `$instance` parameter.
+ *
+ * @param array $cat_args An array of Categories widget options.
+ * @param array $instance Array of settings for the current widget.
+ */
+ wp_list_categories( apply_filters( 'widget_categories_args', $cat_args, $instance ) );
+ ?>
</ul>
-<?php
+ <?php
}
echo $args['after_widget'];
@@ -141,11 +141,11 @@
* @return array Updated settings to save.
*/
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;
}
@@ -159,23 +159,22 @@
*/
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' => '' ) );
+ $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( $instance['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
}