Changeset 23597

Timestamp:

03/04/2013 02:14:23 AM (13 years ago)

Author:

SergeyBiryukov

Message:

Simplify logic in WP_Widget_Recent_Posts and WP_Widget_Recent_Comments. fixes #23089.

File:

• trunk/wp-includes/default-widgets.php (modified) (3 diffs)

trunk/wp-includes/default-widgets.php

@@ -560 +560 @@
                 extract($args);
 
-                $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title'], $instance, $this->id_base);
-                if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
+                $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' );
+                $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+                $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 10;
+                if ( ! $number )
                         $number = 10;
                 $show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false;
@@ -676 +678 @@
                 extract($args, EXTR_SKIP);
                 $output = '';
-                $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Recent Comments' ) : $instance['title'], $instance, $this->id_base );
-
-                if ( empty( $instance['number'] ) || ! $number = absint( $instance['number'] ) )
+
+                $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+                $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+                $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
+                if ( ! $number )
                         $number = 5;
 
@@ -718 +722 @@
 
         function form( $instance ) {
-                $title = isset($instance['title']) ? esc_attr($instance['title']) : '';
-                $number = isset($instance['number']) ? absint($instance['number']) : 5;
-?>
-                <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 $title; ?>" /></p>
-
-                <p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of comments to show:'); ?></label>
-                <input id="<?php echo $this->get_field_id('number'); ?>" name="<?php echo $this->get_field_name('number'); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
+                $title  = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+                $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
+?>
+                <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 $title; ?>" /></p>
+
+                <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
+                <input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
 <?php
         }