X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..0f684a09c03e547d3132bddc970cbeafcd1102f4:/wp-includes/default-widgets.php

diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index bcbae03d..e48cc01f 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -14,21 +14,45 @@
 class WP_Widget_Pages extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site’s WordPress Pages') );
+		$widget_ops = array('classname' => 'widget_pages', 'description' => __( 'A list of your site’s Pages.') );
 		parent::__construct('pages', __('Pages'), $widget_ops);
 	}
 
 	function widget( $args, $instance ) {
 		extract( $args );
 
-		$title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title'], $instance, $this->id_base);
+		/**
+		 * Filter the widget title.
+		 *
+		 * @since 2.6.0
+		 *
+		 * @param string $title    The widget title. Default 'Pages'.
+		 * @param array  $instance An array of the widget's settings.
+		 * @param mixed  $id_base  The widget ID.
+		 */
+		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title'], $instance, $this->id_base );
+
 		$sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
 		$exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude'];
 
 		if ( $sortby == 'menu_order' )
 			$sortby = 'menu_order, post_title';
 
-		$out = wp_list_pages( apply_filters('widget_pages_args', array('title_li' => '', 'echo' => 0, 'sort_column' => $sortby, 'exclude' => $exclude) ) );
+		/**
+		 * Filter the arguments for the Pages widget.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @see wp_list_pages()
+		 *
+		 * @param array $args An array of arguments to retrieve the pages list.
+		 */
+		$out = wp_list_pages( apply_filters( 'widget_pages_args', array(
+			'title_li'    => '',
+			'echo'        => 0,
+			'sort_column' => $sortby,
+			'exclude'     => $exclude
+		) ) );
 
 		if ( !empty( $out ) ) {
 			echo $before_widget;
@@ -107,7 +131,17 @@ class WP_Widget_Links extends WP_Widget {
 		$limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
 
 		$before_widget = preg_replace('/id="[^"]*"/','id="%id"', $before_widget);
-		wp_list_bookmarks(apply_filters('widget_links_args', array(
+
+		/**
+		 * Filter the arguments for the Links widget.
+		 *
+		 * @since 2.6.0
+		 *
+		 * @see wp_list_bookmarks()
+		 *
+		 * @param array $args An array of arguments to retrieve the links list.
+		 */
+		wp_list_bookmarks( apply_filters( 'widget_links_args', array(
 			'title_before' => $before_title, 'title_after' => $after_title,
 			'category_before' => $before_widget, 'category_after' => $after_widget,
 			'show_images' => $show_images, 'show_description' => $show_description,
@@ -115,7 +149,7 @@ class WP_Widget_Links extends WP_Widget {
 			'category' => $category, 'class' => 'linkcat widget',
 			'orderby' => $orderby, 'order' => $order,
 			'limit' => $limit,
-		)));
+		) ) );
 	}
 
 	function update( $new_instance, $old_instance ) {
@@ -190,12 +224,14 @@ class WP_Widget_Links extends WP_Widget {
 class WP_Widget_Search extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") );
-		parent::__construct('search', __('Search'), $widget_ops);
+		$widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site.") );
+		parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops );
 	}
 
 	function widget( $args, $instance ) {
 		extract($args);
+
+		/** This filter is documented in wp-includes/default-widgets.php */
 		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
 		echo $before_widget;
@@ -233,7 +269,7 @@ class WP_Widget_Search extends WP_Widget {
 class WP_Widget_Archives extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s posts') );
+		$widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s Posts.') );
 		parent::__construct('archives', __('Archives'), $widget_ops);
 	}
 
@@ -241,7 +277,9 @@ class WP_Widget_Archives extends WP_Widget {
 		extract($args);
 		$c = ! empty( $instance['count'] ) ? '1' : '0';
 		$d = ! empty( $instance['dropdown'] ) ? '1' : '0';
-		$title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title'], $instance, $this->id_base);
+
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', empty($instance['title'] ) ? __( 'Archives' ) : $instance['title'], $instance, $this->id_base );
 
 		echo $before_widget;
 		if ( $title )
@@ -249,12 +287,45 @@ class WP_Widget_Archives extends WP_Widget {
 
 		if ( $d ) {
 ?>
-		<select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'> <option value=""><?php echo esc_attr(__('Select Month')); ?></option> <?php wp_get_archives(apply_filters('widget_archives_dropdown_args', array('type' => 'monthly', 'format' => 'option', 'show_post_count' => $c))); ?> </select>
+		<select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
+			<option value=""><?php echo esc_attr( __( 'Select Month' ) ); ?></option>
+
+			<?php
+			/**
+			 * Filter the arguments for the Archives widget drop-down.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @see wp_get_archives()
+			 *
+			 * @param array $args An array of Archives widget drop-down arguments.
+			 */
+			wp_get_archives( apply_filters( 'widget_archives_dropdown_args', array(
+				'type'            => 'monthly',
+				'format'          => 'option',
+				'show_post_count' => $c
+			) ) );
+?>
+		</select>
 <?php
 		} else {
 ?>
 		<ul>
-		<?php wp_get_archives(apply_filters('widget_archives_args', array('type' => 'monthly', 'show_post_count' => $c))); ?>
+<?php
+		/**
+		 * Filter the arguments for the Archives widget.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @see wp_get_archives()
+		 *
+		 * @param array $args An array of Archives option arguments.
+		 */
+		wp_get_archives( apply_filters( 'widget_archives_args', array(
+			'type'            => 'monthly',
+			'show_post_count' => $c
+		) ) );
+?>
 		</ul>
 <?php
 		}
@@ -298,13 +369,15 @@ class WP_Widget_Archives extends WP_Widget {
 class WP_Widget_Meta extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") );
+		$widget_ops = array('classname' => 'widget_meta', 'description' => __( "Login, RSS, &amp; WordPress.org links.") );
 		parent::__construct('meta', __('Meta'), $widget_ops);
 	}
 
 	function widget( $args, $instance ) {
 		extract($args);
-		$title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title'], $instance, $this->id_base);
+
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base );
 
 		echo $before_widget;
 		if ( $title )
@@ -315,11 +388,22 @@ class WP_Widget_Meta extends WP_Widget {
 			<li><?php wp_loginout(); ?></li>
 			<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php echo esc_attr(__('Syndicate this site using RSS 2.0')); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
 			<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php echo esc_attr(__('The latest comments to all posts in RSS')); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-			<li><a href="<?php esc_attr_e( 'http://wordpress.org/' ); ?>" title="<?php echo esc_attr(__('Powered by WordPress, state-of-the-art semantic personal publishing platform.')); ?>"><?php
-			/* translators: meta widget link text */
-			_e( 'WordPress.org' );
-			?></a></li>
-			<?php wp_meta(); ?>
+<?php
+			/**
+			 * Filter the "Powered by WordPress" text in the Meta widget.
+			 *
+			 * @since 3.6.0
+			 *
+			 * @param string $title_text Default title text for the WordPress.org link.
+			 */
+			echo apply_filters( 'widget_meta_poweredby', sprintf( '<li><a href="%s" title="%s">%s</a></li>',
+				esc_url( __( 'https://wordpress.org/' ) ),
+				esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ),
+				_x( 'WordPress.org', 'meta widget link text' )
+			) );
+
+			wp_meta();
+?>
 			</ul>
 <?php
 		echo $after_widget;
@@ -349,13 +433,16 @@ class WP_Widget_Meta extends WP_Widget {
 class WP_Widget_Calendar extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s posts') );
+		$widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s Posts.') );
 		parent::__construct('calendar', __('Calendar'), $widget_ops);
 	}
 
 	function widget( $args, $instance ) {
 		extract($args);
-		$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
+
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+
 		echo $before_widget;
 		if ( $title )
 			echo $before_title . $title . $after_title;
@@ -390,14 +477,25 @@ class WP_Widget_Calendar extends WP_Widget {
 class WP_Widget_Text extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_text', 'description' => __('Arbitrary text or HTML'));
+		$widget_ops = array('classname' => 'widget_text', 'description' => __('Arbitrary text or HTML.'));
 		$control_ops = array('width' => 400, 'height' => 350);
 		parent::__construct('text', __('Text'), $widget_ops, $control_ops);
 	}
 
 	function widget( $args, $instance ) {
 		extract($args);
+
+		/** This filter is documented in wp-includes/default-widgets.php */
 		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+
+		/**
+		 * Filter the content of the Text widget.
+		 *
+		 * @since 2.3.0
+		 *
+		 * @param string    $widget_text The widget content.
+		 * @param WP_Widget $instance    WP_Widget instance.
+		 */
 		$text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance );
 		echo $before_widget;
 		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
@@ -440,14 +538,16 @@ class WP_Widget_Text extends WP_Widget {
 class WP_Widget_Categories extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories" ) );
+		$widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories." ) );
 		parent::__construct('categories', __('Categories'), $widget_ops);
 	}
 
 	function widget( $args, $instance ) {
 		extract( $args );
 
-		$title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base);
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base );
+
 		$c = ! empty( $instance['count'] ) ? '1' : '0';
 		$h = ! empty( $instance['hierarchical'] ) ? '1' : '0';
 		$d = ! empty( $instance['dropdown'] ) ? '1' : '0';
@@ -460,7 +560,17 @@ class WP_Widget_Categories extends WP_Widget {
 
 		if ( $d ) {
 			$cat_args['show_option_none'] = __('Select Category');
-			wp_dropdown_categories(apply_filters('widget_categories_dropdown_args', $cat_args));
+
+			/**
+			 * Filter the arguments for the Categories widget drop-down.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @see wp_dropdown_categories()
+			 *
+			 * @param array $cat_args An array of Categories widget drop-down arguments.
+			 */
+			wp_dropdown_categories( apply_filters( 'widget_categories_dropdown_args', $cat_args ) );
 ?>
 
 <script type='text/javascript'>
@@ -481,7 +591,15 @@ class WP_Widget_Categories extends WP_Widget {
 		<ul>
 <?php
 		$cat_args['title_li'] = '';
-		wp_list_categories(apply_filters('widget_categories_args', $cat_args));
+
+		/**
+		 * Filter the arguments for the Categories widget.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param array $cat_args An array of Categories widget options.
+		 */
+		wp_list_categories( apply_filters( 'widget_categories_args', $cat_args ) );
 ?>
 		</ul>
 <?php
@@ -532,7 +650,7 @@ class WP_Widget_Categories extends WP_Widget {
 class WP_Widget_Recent_Posts extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") );
+		$widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "Your site&#8217;s most recent Posts.") );
 		parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
 		$this->alt_option_name = 'widget_recent_entries';
 
@@ -542,13 +660,18 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	}
 
 	function widget($args, $instance) {
-		$cache = wp_cache_get('widget_recent_posts', 'widget');
+		$cache = array();
+		if ( ! $this->is_preview() ) {
+			$cache = wp_cache_get( 'widget_recent_posts', 'widget' );
+		}
 
-		if ( !is_array($cache) )
+		if ( ! is_array( $cache ) ) {
 			$cache = array();
+		}
 
-		if ( ! isset( $args['widget_id'] ) )
+		if ( ! isset( $args['widget_id'] ) ) {
 			$args['widget_id'] = $this->id;
+		}
 
 		if ( isset( $cache[ $args['widget_id'] ] ) ) {
 			echo $cache[ $args['widget_id'] ];
@@ -558,12 +681,32 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 		ob_start();
 		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'] ) )
- 			$number = 10;
+		$title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' );
+
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
+		if ( ! $number )
+			$number = 5;
 		$show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false;
 
-		$r = new WP_Query( apply_filters( 'widget_posts_args', array( 'posts_per_page' => $number, 'no_found_rows' => true, 'post_status' => 'publish', 'ignore_sticky_posts' => true ) ) );
+		/**
+		 * Filter the arguments for the Recent Posts widget.
+		 *
+		 * @since 3.4.0
+		 *
+		 * @see WP_Query::get_posts()
+		 *
+		 * @param array $args An array of arguments used to retrieve the recent posts.
+		 */
+		$r = new WP_Query( apply_filters( 'widget_posts_args', array(
+			'posts_per_page'      => $number,
+			'no_found_rows'       => true,
+			'post_status'         => 'publish',
+			'ignore_sticky_posts' => true
+		) ) );
+
 		if ($r->have_posts()) :
 ?>
 		<?php echo $before_widget; ?>
@@ -571,7 +714,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 		<ul>
 		<?php while ( $r->have_posts() ) : $r->the_post(); ?>
 			<li>
-				<a href="<?php the_permalink() ?>" title="<?php echo esc_attr( get_the_title() ? get_the_title() : get_the_ID() ); ?>"><?php if ( get_the_title() ) the_title(); else the_ID(); ?></a>
+				<a href="<?php the_permalink(); ?>"><?php get_the_title() ? the_title() : the_ID(); ?></a>
 			<?php if ( $show_date ) : ?>
 				<span class="post-date"><?php echo get_the_date(); ?></span>
 			<?php endif; ?>
@@ -585,15 +728,19 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 
 		endif;
 
-		$cache[$args['widget_id']] = ob_get_flush();
-		wp_cache_set('widget_recent_posts', $cache, 'widget');
+		if ( ! $this->is_preview() ) {
+			$cache[ $args['widget_id'] ] = ob_get_flush();
+			wp_cache_set( 'widget_recent_posts', $cache, 'widget' );
+		} else {
+			ob_end_flush();
+		}
 	}
 
 	function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
 		$instance['title'] = strip_tags($new_instance['title']);
 		$instance['number'] = (int) $new_instance['number'];
-		$instance['show_date'] = (bool) $new_instance['show_date'];
+		$instance['show_date'] = isset( $new_instance['show_date'] ) ? (bool) $new_instance['show_date'] : false;
 		$this->flush_widget_cache();
 
 		$alloptions = wp_cache_get( 'alloptions', 'options' );
@@ -632,7 +779,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 class WP_Widget_Recent_Comments extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'The most recent comments' ) );
+		$widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'Your site&#8217;s most recent comments.' ) );
 		parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
 		$this->alt_option_name = 'widget_recent_comments';
 
@@ -640,10 +787,20 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 			add_action( 'wp_head', array($this, 'recent_comments_style') );
 
 		add_action( 'comment_post', array($this, 'flush_widget_cache') );
+		add_action( 'edit_comment', array($this, 'flush_widget_cache') );
 		add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
 	}
 
 	function recent_comments_style() {
+
+		/**
+		 * Filter the Recent Comments default widget styles.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param bool   $active  Whether the widget is active. Default true.
+		 * @param string $id_base The widget ID.
+		 */
 		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
 			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
 			return;
@@ -659,10 +816,13 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	function widget( $args, $instance ) {
 		global $comments, $comment;
 
-		$cache = wp_cache_get('widget_recent_comments', 'widget');
-
-		if ( ! is_array( $cache ) )
+		$cache = array();
+		if ( ! $this->is_preview() ) {
+			$cache = wp_cache_get('widget_recent_comments', 'widget');
+		}
+		if ( ! is_array( $cache ) ) {
 			$cache = array();
+		}
 
 		if ( ! isset( $args['widget_id'] ) )
 			$args['widget_id'] = $this->id;
@@ -672,14 +832,33 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 			return;
 		}
 
- 		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'] ) )
- 			$number = 5;
+		extract($args, EXTR_SKIP);
+		$output = '';
+
+		$title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
+		if ( ! $number )
+			$number = 5;
+
+		/**
+		 * Filter the arguments for the Recent Comments widget.
+		 *
+		 * @since 3.4.0
+		 *
+		 * @see get_comments()
+		 *
+		 * @param array $comment_args An array of arguments used to retrieve the recent comments.
+		 */
+		$comments = get_comments( apply_filters( 'widget_comments_args', array(
+			'number'      => $number,
+			'status'      => 'approve',
+			'post_status' => 'publish'
+		) ) );
 
-		$comments = get_comments( apply_filters( 'widget_comments_args', array( 'number' => $number, 'status' => 'approve', 'post_status' => 'publish' ) ) );
 		$output .= $before_widget;
 		if ( $title )
 			$output .= $before_title . $title . $after_title;
@@ -693,13 +872,16 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 			foreach ( (array) $comments as $comment) {
 				$output .=  '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . esc_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
 			}
- 		}
+		}
 		$output .= '</ul>';
 		$output .= $after_widget;
 
 		echo $output;
-		$cache[$args['widget_id']] = $output;
-		wp_cache_set('widget_recent_comments', $cache, 'widget');
+
+		if ( ! $this->is_preview() ) {
+			$cache[ $args['widget_id'] ] = $output;
+			wp_cache_set( 'widget_recent_comments', $cache, 'widget' );
+		}
 	}
 
 	function update( $new_instance, $old_instance ) {
@@ -716,14 +898,14 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	}
 
 	function form( $instance ) {
-		$title = isset($instance['title']) ? esc_attr($instance['title']) : '';
-		$number = isset($instance['number']) ? absint($instance['number']) : 5;
+		$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( '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>
+		<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
 	}
 }
@@ -736,7 +918,7 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 class WP_Widget_RSS extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array( 'description' => __('Entries from any RSS or Atom feed') );
+		$widget_ops = array( 'description' => __('Entries from any RSS or Atom feed.') );
 		$control_ops = array( 'width' => 400, 'height' => 200 );
 		parent::__construct( 'rss', __('RSS'), $widget_ops, $control_ops );
 	}
@@ -776,7 +958,9 @@ class WP_Widget_RSS extends WP_Widget {
 		if ( empty($title) )
 			$title = empty($desc) ? __('Unknown Feed') : $desc;
 
-		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
 		$url = esc_url(strip_tags($url));
 		$icon = includes_url('images/rss.png');
 		if ( $title )
@@ -860,21 +1044,23 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 		if ( empty($title) )
 			$title = __('Untitled');
 
-		$desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
+		$desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
+		$desc = esc_attr( strip_tags( $desc ) );
+		$desc = trim( str_replace( array( "\n", "\r" ), ' ', $desc ) );
 		$desc = wp_html_excerpt( $desc, 360 );
 
-		// Append ellipsis. Change existing [...] to [&hellip;].
-		if ( '[...]' == substr( $desc, -5 ) )
-			$desc = substr( $desc, 0, -5 ) . '[&hellip;]';
-		elseif ( '[&hellip;]' != substr( $desc, -10 ) )
-			$desc .= ' [&hellip;]';
+		$summary = '';
+		if ( $show_summary ) {
+			$summary = $desc;
 
-		$desc = esc_html( $desc );
+			// Append ellipsis. Change existing [...] to [&hellip;].
+			if ( '[...]' == substr( $summary, -5 ) ) {
+				$summary = substr( $summary, 0, -5 ) . '[&hellip;]';
+			} elseif ( '[&hellip;]' != substr( $summary, -10 ) && $desc !== $summary ) {
+				$summary .= ' [&hellip;]';
+			}
 
-		if ( $show_summary ) {
-			$summary = "<div class='rssSummary'>$desc</div>";
-		} else {
-			$summary = '';
+			$summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
 		}
 
 		$date = '';
@@ -897,8 +1083,10 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 
 		if ( $link == '' ) {
 			echo "<li>$title{$date}{$summary}{$author}</li>";
+		} elseif ( $show_summary ) {
+			echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>";
 		} else {
-			echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$summary}{$author}</li>";
+			echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$author}</li>";
 		}
 	}
 	echo '</ul>';
@@ -923,7 +1111,7 @@ function wp_widget_rss_form( $args, $inputs = null ) {
 	$default_inputs = array( 'url' => true, 'title' => true, 'items' => true, 'show_summary' => true, 'show_author' => true, 'show_date' => true );
 	$inputs = wp_parse_args( $inputs, $default_inputs );
 	extract( $args );
-	extract( $inputs, EXTR_SKIP);
+	extract( $inputs, EXTR_SKIP );
 
 	$number = esc_attr( $number );
 	$title  = esc_attr( $title );
@@ -994,11 +1182,11 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
 	$items = (int) $widget_rss['items'];
 	if ( $items < 1 || 20 < $items )
 		$items = 10;
-	$url           = esc_url_raw(strip_tags( $widget_rss['url'] ));
-	$title         = trim(strip_tags( $widget_rss['title'] ));
-	$show_summary  = isset($widget_rss['show_summary']) ? (int) $widget_rss['show_summary'] : 0;
-	$show_author   = isset($widget_rss['show_author']) ? (int) $widget_rss['show_author'] :0;
-	$show_date     = isset($widget_rss['show_date']) ? (int) $widget_rss['show_date'] : 0;
+	$url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
+	$title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
+	$show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
+	$show_author   = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0;
+	$show_date     = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
 
 	if ( $check_feed ) {
 		$rss = fetch_feed($url);
@@ -1027,7 +1215,7 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
 class WP_Widget_Tag_Cloud extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array( 'description' => __( "Your most used tags in cloud format") );
+		$widget_ops = array( 'description' => __( "A cloud of your most used tags.") );
 		parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
 	}
 
@@ -1044,13 +1232,29 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 				$title = $tax->labels->name;
 			}
 		}
-		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
+
+		/** This filter is documented in wp-includes/default-widgets.php */
+		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
 		echo $before_widget;
 		if ( $title )
 			echo $before_title . $title . $after_title;
 		echo '<div class="tagcloud">';
-		wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
+
+		/**
+		 * Filter the taxonomy used in the Tag Cloud widget.
+		 *
+		 * @since 2.8.0
+		 * @since 3.0.0 Added taxonomy drop-down.
+		 *
+		 * @see wp_tag_cloud()
+		 *
+		 * @param array $current_taxonomy The taxonomy to use in the tag cloud. Default 'tags'.
+		 */
+		wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array(
+			'taxonomy' => $current_taxonomy
+		) ) );
+
 		echo "</div>\n";
 		echo $after_widget;
 	}
@@ -1094,7 +1298,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
  class WP_Nav_Menu_Widget extends WP_Widget {
 
 	function __construct() {
-		$widget_ops = array( 'description' => __('Use this widget to add one of your custom menus as a widget.') );
+		$widget_ops = array( 'description' => __('Add a custom menu to your sidebar.') );
 		parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
 	}
 
@@ -1105,6 +1309,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 		if ( !$nav_menu )
 			return;
 
+		/** This filter is documented in wp-includes/default-widgets.php */
 		$instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
 		echo $args['before_widget'];
@@ -1128,7 +1333,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 		$nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
 
 		// Get menus
-		$menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+		$menus = wp_get_nav_menus( array( 'orderby' => 'name' ) );
 
 		// If no menus exists, direct the user to go and create some.
 		if ( !$menus ) {
@@ -1143,11 +1348,12 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 		<p>
 			<label for="<?php echo $this->get_field_id('nav_menu'); ?>"><?php _e('Select Menu:'); ?></label>
 			<select id="<?php echo $this->get_field_id('nav_menu'); ?>" name="<?php echo $this->get_field_name('nav_menu'); ?>">
+				<option value="0"><?php _e( '&mdash; Select &mdash;' ) ?></option>
 		<?php
 			foreach ( $menus as $menu ) {
 				echo '<option value="' . $menu->term_id . '"'
 					. selected( $nav_menu, $menu->term_id, false )
-					. '>'. $menu->name . '</option>';
+					. '>'. esc_html( $menu->name ) . '</option>';
 			}
 		?>
 			</select>
@@ -1195,7 +1401,12 @@ function wp_widgets_init() {
 
 	register_widget('WP_Nav_Menu_Widget');
 
-	do_action('widgets_init');
+	/**
+	 * Fires after all default WordPress widgets have been registered.
+	 *
+	 * @since 2.2.0
+	 */
+	do_action( 'widgets_init' );
 }
 
 add_action('init', 'wp_widgets_init', 1);