Changes from branches/3.0/wp-includes/default-widgets.php at r15317 to trunk/wp-includes/default-widgets.php at r17260

File:

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

trunk/wp-includes/default-widgets.php

@@ -1 +1 @@
 <?php
-
 /**
  * Default Widgets
@@ -263 +262 @@
         <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>
+            <input class="checkbox" type="checkbox" <?php echo $dropdown; ?> id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>" /> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label>
+            <br/>
             <input class="checkbox" type="checkbox" <?php echo $count; ?> id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>" /> <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label>
-            <br />
-            <input class="checkbox" type="checkbox" <?php echo $dropdown; ?> id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>" /> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as a drop down'); ?></label>
         </p>
 <?php
@@ -400 +399 @@
         $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) );
         $title = strip_tags($instance['title']);
-        $text = format_to_edit($instance['text']);
+        $text = esc_textarea($instance['text']);
 ?>
         <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
@@ -492 +491 @@
 
         <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( 'Show as dropdown' ); ?></label><br />
+        <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 ); ?> />
@@ -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;
-
-        $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
+        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));
         if ($r->have_posts()) :
 ?>
@@ -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>
@@ -614 +608 @@
     }
 
-    function recent_comments_style() { ?>
+    function recent_comments_style() {
+        if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
+            || ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
+            return;
+        ?>
     <style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
 <?php
@@ -640 +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' ) );
@@ -667 +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();
 
@@ -715 +711 @@
 
         if ( empty($url) )
+            return;
+
+        // self-url destruction sequence
+        if ( $url == site_url() || $url == home_url() )
             return;
 
@@ -837 +837 @@
         $date = '';
         if ( $show_date ) {
-            $date = $item->get_date();
+            $date = $item->get_date( 'U' );
 
             if ( $date ) {
-                if ( $date_stamp = strtotime( $date ) )
-                    $date = ' <span class="rss-date">' . date_i18n( get_option( 'date_format' ), $date_stamp ) . '</span>';
-                else
-                    $date = '';
+                $date = ' <span class="rss-date">' . date_i18n( get_option( 'date_format' ), $date ) . '</span>';
             }
         }
@@ -1012 +1009 @@
         if ( $title )
             echo $before_title . $title . $after_title;
-        echo '<div>';
+        echo '<div class="tagcloud">';
         wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
         echo "</div>\n";