Ticket #14543: 14543.3.patch

wp-includes/default-widgets.php

@@ -537 +537 @@
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title'], $instance, $this->id_base);
                 if ( !$number = (int) $instance['number'] )
                         $number = 10;
-                else if ( $number < 1 )
-                        $number = 1;
-                else if ( $number > 15 )
-                        $number = 15;
 
                 $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
                 if ($r->have_posts()) :
@@ -567 +563 @@
                 $instance = $old_instance;
                 $instance['title'] = strip_tags($new_instance['title']);
                 $instance['number'] = (int) $new_instance['number'];
+                if( $instance['number'] < 1 || $instance['number'] > 15 )
+                        $instance['number'] = 5;
                 $this->flush_widget_cache();
 
                 $alloptions = wp_cache_get( 'alloptions', 'options' );
@@ -641 +639 @@
 
                 if ( ! $number = (int) $instance['number'] )
                         $number = 5;
-                else if ( $number < 1 )
-                        $number = 1;
 
                 $comments = get_comments( array( 'number' => $number, 'status' => 'approve' ) );
                 $output .= $before_widget;
@@ -667 +663 @@
                 $instance = $old_instance;
                 $instance['title'] = strip_tags($new_instance['title']);
                 $instance['number'] = (int) $new_instance['number'];
+                if( $instance['number'] < 1 || $instance['number'] > apply_filters( 'wp_recent_comments_limit', 20 ) )
+                        $instance['number'] = 20;
                 $this->flush_widget_cache();
 
                 $alloptions = wp_cache_get( 'alloptions', 'options' );