Changeset 16922

Timestamp:

12/14/2010 05:58:47 PM (16 years ago)

Author:

nacin

Message:

Remove ceilings on recent comments and posts widgets and dashboard widgets. fixes #14543.

Location:

trunk

Files:

• wp-admin/includes/dashboard.php (modified) (3 diffs)
• wp-includes/default-widgets.php (modified) (6 diffs)

trunk/wp-admin/includes/dashboard.php

@@ -607 +607 @@
 
         $widgets = get_option( 'dashboard_widget_options' );
-        if ( isset( $widgets['dashboard_recent_comments'] ) && isset( $widgets['dashboard_recent_comments']['items'] ) )
-                $total_items = (int) $widgets['dashboard_recent_comments']['items'];
-        else
-                $total_items = 5;
+        $total_items = isset( $widgets['dashboard_recent_comments'] ) && isset( $widgets['dashboard_recent_comments']['items'] )
+                ? absint( $widgets['dashboard_recent_comments']['items'] ) : 5;
 
         while ( count( $comments ) < 5 && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ORDER BY c.comment_date_gmt DESC LIMIT $start, 50" ) ) {
@@ -758 +756 @@
 
         if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-recent-comments']) ) {
-                $number = (int) stripslashes($_POST['widget-recent-comments']['items']);
-                if ( $number < 1 || $number > 30 )
-                        $number = 5;
+                $number = absint( stripslashes($_POST['widget-recent-comments']['items']) );
                 $widget_options['dashboard_recent_comments']['items'] = $number;
                 update_option( 'dashboard_widget_options', $widget_options );
@@ -768 +764 @@
 
         echo '<p><label for="comments-number">' . __('Number of comments to show:') . '</label>';
-        echo '<input id="comments-number" name="widget-recent-comments[items]" type="text" value="' . $number . '" size="3" /> <small>' . __( '(at most 30)' ) . '</small></p>';
+        echo '<input id="comments-number" name="widget-recent-comments[items]" type="text" value="' . $number . '" size="3" /></p>';
 }
 

trunk/wp-includes/default-widgets.php

@@ -1 +1 @@
 <?php
-
 /**
  * Default Widgets
@@ -536 +535 @@
 
                 $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;
+                if ( ! $number = absint( $instance['number'] ) )
+                        $number = 10;
 
                 $r = new WP_Query(array('posts_per_page' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
@@ -583 +578 @@
         function form( $instance ) {
                 $title = isset($instance['title']) ? esc_attr($instance['title']) : '';
-                if ( !isset($instance['number']) || !$number = (int) $instance['number'] )
-                        $number = 5;
+                $number = isset($instance['number']) ? absint($instance['number']) : 5;
 ?>
                 <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
@@ -591 +585 @@
                 <p><label for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of posts 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>
-                <small><?php _e('(at most 15)'); ?></small>
 <?php
         }
@@ -645 +638 @@
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Comments') : $instance['title']);
 
-                if ( ! $number = (int) $instance['number'] )
+                if ( ! $number = absint( $instance['number'] ) )
                         $number = 5;
-                else if ( $number < 1 )
-                        $number = 1;
 
                 $comments = get_comments( array( 'number' => $number, 'status' => 'approve' ) );
@@ -672 +663 @@
                 $instance = $old_instance;
                 $instance['title'] = strip_tags($new_instance['title']);
-                $instance['number'] = (int) $new_instance['number'];
+                $instance['number'] = absint( $new_instance['number'] );
                 $this->flush_widget_cache();