diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/widgets/class-wp-widget-links.php --- a/wp/wp-includes/widgets/class-wp-widget-links.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-includes/widgets/class-wp-widget-links.php Mon Oct 14 18:28:13 2019 +0200 @@ -23,7 +23,7 @@ */ public function __construct() { $widget_ops = array( - 'description' => __( 'Your blogroll' ), + 'description' => __( 'Your blogroll' ), 'customize_selective_refresh' => true, ); parent::__construct( 'links', __( 'Links' ), $widget_ops ); @@ -39,14 +39,14 @@ * @param array $instance Settings for the current Links widget instance. */ public function widget( $args, $instance ) { - $show_description = isset($instance['description']) ? $instance['description'] : false; - $show_name = isset($instance['name']) ? $instance['name'] : false; - $show_rating = isset($instance['rating']) ? $instance['rating'] : false; - $show_images = isset($instance['images']) ? $instance['images'] : true; - $category = isset($instance['category']) ? $instance['category'] : false; - $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name'; - $order = $orderby == 'rating' ? 'DESC' : 'ASC'; - $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1; + $show_description = isset( $instance['description'] ) ? $instance['description'] : false; + $show_name = isset( $instance['name'] ) ? $instance['name'] : false; + $show_rating = isset( $instance['rating'] ) ? $instance['rating'] : false; + $show_images = isset( $instance['images'] ) ? $instance['images'] : true; + $category = isset( $instance['category'] ) ? $instance['category'] : false; + $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name'; + $order = $orderby == 'rating' ? 'DESC' : 'ASC'; + $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1; $before_widget = preg_replace( '/id="[^"]*"/', 'id="%id"', $args['before_widget'] ); @@ -92,18 +92,25 @@ */ public function update( $new_instance, $old_instance ) { $new_instance = (array) $new_instance; - $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 ); + $instance = array( + 'images' => 0, + 'name' => 0, + 'description' => 0, + 'rating' => 0, + ); foreach ( $instance as $field => $val ) { - if ( isset($new_instance[$field]) ) - $instance[$field] = 1; + if ( isset( $new_instance[ $field ] ) ) { + $instance[ $field ] = 1; + } } $instance['orderby'] = 'name'; - if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) + if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) { $instance['orderby'] = $new_instance['orderby']; + } $instance['category'] = intval( $new_instance['category'] ); - $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1; + $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1; return $instance; } @@ -118,15 +125,27 @@ public function form( $instance ) { //Defaults - $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) ); + $instance = wp_parse_args( + (array) $instance, + array( + 'images' => true, + 'name' => true, + 'description' => false, + 'rating' => false, + 'category' => false, + 'orderby' => 'name', + 'limit' => -1, + ) + ); $link_cats = get_terms( 'link_category' ); - if ( ! $limit = intval( $instance['limit'] ) ) + if ( ! $limit = intval( $instance['limit'] ) ) { $limit = -1; - ?> + } + ?>

- - + term_id ) . '"' @@ -135,8 +154,8 @@ } ?> - - @@ -144,18 +163,18 @@

- id="get_field_id('images'); ?>" name="get_field_name('images'); ?>" /> -
- id="get_field_id('name'); ?>" name="get_field_name('name'); ?>" /> -
- id="get_field_id('description'); ?>" name="get_field_name('description'); ?>" /> -
- id="get_field_id('rating'); ?>" name="get_field_name('rating'); ?>" /> - + id="get_field_id( 'images' ); ?>" name="get_field_name( 'images' ); ?>" /> +
+ id="get_field_id( 'name' ); ?>" name="get_field_name( 'name' ); ?>" /> +
+ id="get_field_id( 'description' ); ?>" name="get_field_name( 'description' ); ?>" /> +
+ id="get_field_id( 'rating' ); ?>" name="get_field_name( 'rating' ); ?>" /> +

- - + +