--- a/web/wp-includes/default-widgets.php Wed Dec 19 12:35:13 2012 -0800
+++ b/web/wp-includes/default-widgets.php Wed Dec 19 17:46:52 2012 -0800
@@ -150,8 +150,8 @@
<option value=""><?php _ex('All Links', 'links widget'); ?></option>
<?php
foreach ( $link_cats as $link_cat ) {
- echo '<option value="' . intval($link_cat->term_id) . '"'
- . ( $link_cat->term_id == $instance['category'] ? ' selected="selected"' : '' )
+ echo '<option value="' . intval( $link_cat->term_id ) . '"'
+ . selected( $instance['category'], $link_cat->term_id, false )
. '>' . $link_cat->name . "</option>\n";
}
?>
@@ -161,7 +161,7 @@
<option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e( 'Link title' ); ?></option>
<option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e( 'Link rating' ); ?></option>
<option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option>
- <option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _e( 'Random' ); ?></option>
+ <option value="rand"<?php selected( $instance['orderby'], 'rand' ); ?>><?php _ex( 'Random', 'Links widget' ); ?></option>
</select>
</p>
<p>
@@ -355,7 +355,7 @@
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? ' ' : $instance['title'], $instance, $this->id_base);
+ $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;
@@ -536,9 +536,9 @@
parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
$this->alt_option_name = 'widget_recent_entries';
- add_action( 'save_post', array(&$this, 'flush_widget_cache') );
- add_action( 'deleted_post', array(&$this, 'flush_widget_cache') );
- add_action( 'switch_theme', array(&$this, 'flush_widget_cache') );
+ add_action( 'save_post', array($this, 'flush_widget_cache') );
+ add_action( 'deleted_post', array($this, 'flush_widget_cache') );
+ add_action( 'switch_theme', array($this, 'flush_widget_cache') );
}
function widget($args, $instance) {
@@ -561,6 +561,7 @@
$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;
+ $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 ) ) );
if ($r->have_posts()) :
@@ -568,8 +569,13 @@
<?php echo $before_widget; ?>
<?php if ( $title ) echo $before_title . $title . $after_title; ?>
<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></li>
+ <?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>
+ <?php if ( $show_date ) : ?>
+ <span class="post-date"><?php echo get_the_date(); ?></span>
+ <?php endif; ?>
+ </li>
<?php endwhile; ?>
</ul>
<?php echo $after_widget; ?>
@@ -587,6 +593,7 @@
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
$instance['number'] = (int) $new_instance['number'];
+ $instance['show_date'] = (bool) $new_instance['show_date'];
$this->flush_widget_cache();
$alloptions = wp_cache_get( 'alloptions', 'options' );
@@ -601,14 +608,18 @@
}
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;
+ $show_date = isset( $instance['show_date'] ) ? (bool) $instance['show_date'] : false;
?>
- <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 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>
+ <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>
+
+ <p><input class="checkbox" type="checkbox" <?php checked( $show_date ); ?> id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" />
+ <label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Display post date?' ); ?></label></p>
<?php
}
}
@@ -626,10 +637,10 @@
$this->alt_option_name = 'widget_recent_comments';
if ( is_active_widget(false, false, $this->id_base) )
- add_action( 'wp_head', array(&$this, 'recent_comments_style') );
+ add_action( 'wp_head', array($this, 'recent_comments_style') );
- add_action( 'comment_post', array(&$this, 'flush_widget_cache') );
- add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') );
+ add_action( 'comment_post', array($this, 'flush_widget_cache') );
+ add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
}
function recent_comments_style() {
@@ -675,6 +686,10 @@
$output .= '<ul id="recentcomments">';
if ( $comments ) {
+ // Prime cache for associated posts. (Prime post term cache if we need it for permalinks.)
+ $post_ids = array_unique( wp_list_pluck( $comments, 'comment_post_ID' ) );
+ _prime_post_caches( $post_ids, strpos( get_option( 'permalink_structure' ), '%category%' ), false );
+
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>';
}
@@ -829,7 +844,7 @@
$show_date = (int) $show_date;
if ( !$rss->get_item_quantity() ) {
- echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
+ echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>';
$rss->__destruct();
unset($rss);
return;
@@ -935,7 +950,7 @@
<select id="rss-items-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][items]">
<?php
for ( $i = 1; $i <= 20; ++$i )
- echo "<option value='$i' " . ( $items == $i ? "selected='selected'" : '' ) . ">$i</option>";
+ echo "<option value='$i' " . selected( $items, $i, false ) . ">$i</option>";
?>
</select></p>
<?php endif; if ( $inputs['show_summary'] ) : ?>
@@ -1130,8 +1145,9 @@
<select id="<?php echo $this->get_field_id('nav_menu'); ?>" name="<?php echo $this->get_field_name('nav_menu'); ?>">
<?php
foreach ( $menus as $menu ) {
- $selected = $nav_menu == $menu->term_id ? ' selected="selected"' : '';
- echo '<option'. $selected .' value="'. $menu->term_id .'">'. $menu->name .'</option>';
+ echo '<option value="' . $menu->term_id . '"'
+ . selected( $nav_menu, $menu->term_id, false )
+ . '>'. $menu->name . '</option>';
}
?>
</select>
@@ -1158,7 +1174,8 @@
register_widget('WP_Widget_Archives');
- register_widget('WP_Widget_Links');
+ if ( get_option( 'link_manager_enabled' ) )
+ register_widget('WP_Widget_Links');
register_widget('WP_Widget_Meta');