--- a/web/wp-includes/default-widgets.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-includes/default-widgets.php Mon Nov 19 18:26:13 2012 +0100
@@ -1,5 +1,4 @@
<?php
-
/**
* Default Widgets
*
@@ -14,15 +13,15 @@
*/
class WP_Widget_Pages extends WP_Widget {
- function WP_Widget_Pages() {
- $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your blog’s WordPress Pages') );
- $this->WP_Widget('pages', __('Pages'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site’s WordPress Pages') );
+ parent::__construct('pages', __('Pages'), $widget_ops);
}
function widget( $args, $instance ) {
extract( $args );
- $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Pages' ) : $instance['title']);
+ $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'];
@@ -90,9 +89,9 @@
*/
class WP_Widget_Links extends WP_Widget {
- function WP_Widget_Links() {
+ function __construct() {
$widget_ops = array('description' => __( "Your blogroll" ) );
- $this->WP_Widget('links', __('Links'), $widget_ops);
+ parent::__construct('links', __('Links'), $widget_ops);
}
function widget( $args, $instance ) {
@@ -103,12 +102,9 @@
$show_rating = isset($instance['rating']) ? $instance['rating'] : false;
$show_images = isset($instance['images']) ? $instance['images'] : true;
$category = isset($instance['category']) ? $instance['category'] : false;
-
- if ( is_admin() && !$category ) {
- // Display All Links widget as such in the widgets screen
- echo $before_widget . $before_title. __('All Links') . $after_title . $after_widget;
- return;
- }
+ $orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
+ $order = $orderby == 'rating' ? 'DESC' : 'ASC';
+ $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(
@@ -116,18 +112,26 @@
'category_before' => $before_widget, 'category_after' => $after_widget,
'show_images' => $show_images, 'show_description' => $show_description,
'show_name' => $show_name, 'show_rating' => $show_rating,
- 'category' => $category, 'class' => 'linkcat widget'
+ 'category' => $category, 'class' => 'linkcat widget',
+ 'orderby' => $orderby, 'order' => $order,
+ 'limit' => $limit,
)));
}
function update( $new_instance, $old_instance ) {
$new_instance = (array) $new_instance;
- $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0);
+ $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
foreach ( $instance as $field => $val ) {
if ( isset($new_instance[$field]) )
$instance[$field] = 1;
}
- $instance['category'] = intval($new_instance['category']);
+
+ $instance['orderby'] = 'name';
+ if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) )
+ $instance['orderby'] = $new_instance['orderby'];
+
+ $instance['category'] = intval( $new_instance['category'] );
+ $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
return $instance;
}
@@ -135,13 +139,15 @@
function form( $instance ) {
//Defaults
- $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false ) );
- $link_cats = get_terms( 'link_category');
+ $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
+ $link_cats = get_terms( 'link_category' );
+ if ( ! $limit = intval( $instance['limit'] ) )
+ $limit = -1;
?>
<p>
- <label for="<?php echo $this->get_field_id('category'); ?>" class="screen-reader-text"><?php _e('Select Link Category'); ?></label>
+ <label for="<?php echo $this->get_field_id('category'); ?>"><?php _e( 'Select Link Category:' ); ?></label>
<select class="widefat" id="<?php echo $this->get_field_id('category'); ?>" name="<?php echo $this->get_field_name('category'); ?>">
- <option value=""><?php _e('All Links'); ?></option>
+ <option value=""><?php _ex('All Links', 'links widget'); ?></option>
<?php
foreach ( $link_cats as $link_cat ) {
echo '<option value="' . intval($link_cat->term_id) . '"'
@@ -149,7 +155,15 @@
. '>' . $link_cat->name . "</option>\n";
}
?>
- </select></p>
+ </select>
+ <label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e( 'Sort by:' ); ?></label>
+ <select name="<?php echo $this->get_field_name('orderby'); ?>" id="<?php echo $this->get_field_id('orderby'); ?>" class="widefat">
+ <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>
+ </select>
+ </p>
<p>
<input class="checkbox" type="checkbox" <?php checked($instance['images'], true) ?> id="<?php echo $this->get_field_id('images'); ?>" name="<?php echo $this->get_field_name('images'); ?>" />
<label for="<?php echo $this->get_field_id('images'); ?>"><?php _e('Show Link Image'); ?></label><br />
@@ -160,6 +174,10 @@
<input class="checkbox" type="checkbox" <?php checked($instance['rating'], true) ?> id="<?php echo $this->get_field_id('rating'); ?>" name="<?php echo $this->get_field_name('rating'); ?>" />
<label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label>
</p>
+ <p>
+ <label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e( 'Number of links to show:' ); ?></label>
+ <input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" />
+ </p>
<?php
}
}
@@ -171,14 +189,14 @@
*/
class WP_Widget_Search extends WP_Widget {
- function WP_Widget_Search() {
- $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") );
- $this->WP_Widget('search', __('Search'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") );
+ parent::__construct('search', __('Search'), $widget_ops);
}
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', $instance['title']);
+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
echo $before_widget;
if ( $title )
@@ -214,16 +232,16 @@
*/
class WP_Widget_Archives extends WP_Widget {
- function WP_Widget_Archives() {
- $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your blog’s posts') );
- $this->WP_Widget('archives', __('Archives'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s posts') );
+ parent::__construct('archives', __('Archives'), $widget_ops);
}
function widget( $args, $instance ) {
extract($args);
- $c = $instance['count'] ? '1' : '0';
- $d = $instance['dropdown'] ? '1' : '0';
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title']);
+ $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);
echo $before_widget;
if ( $title )
@@ -262,9 +280,9 @@
?>
<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
}
@@ -279,14 +297,14 @@
*/
class WP_Widget_Meta extends WP_Widget {
- function WP_Widget_Meta() {
+ function __construct() {
$widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") );
- $this->WP_Widget('meta', __('Meta'), $widget_ops);
+ parent::__construct('meta', __('Meta'), $widget_ops);
}
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title']);
+ $title = apply_filters('widget_title', empty($instance['title']) ? __('Meta') : $instance['title'], $instance, $this->id_base);
echo $before_widget;
if ( $title )
@@ -297,7 +315,10 @@
<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="http://wordpress.org/" title="<?php echo esc_attr(__('Powered by WordPress, state-of-the-art semantic personal publishing platform.')); ?>">WordPress.org</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(); ?>
</ul>
<?php
@@ -327,14 +348,14 @@
*/
class WP_Widget_Calendar extends WP_Widget {
- function WP_Widget_Calendar() {
- $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your blog’s posts') );
- $this->WP_Widget('calendar', __('Calendar'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site’s posts') );
+ parent::__construct('calendar', __('Calendar'), $widget_ops);
}
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? ' ' : $instance['title']);
+ $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;
@@ -368,19 +389,19 @@
*/
class WP_Widget_Text extends WP_Widget {
- function WP_Widget_Text() {
+ function __construct() {
$widget_ops = array('classname' => 'widget_text', 'description' => __('Arbitrary text or HTML'));
$control_ops = array('width' => 400, 'height' => 350);
- $this->WP_Widget('text', __('Text'), $widget_ops, $control_ops);
+ parent::__construct('text', __('Text'), $widget_ops, $control_ops);
}
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title']);
- $text = apply_filters( 'widget_text', $instance['text'] );
+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+ $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance );
echo $before_widget;
if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
- <div class="textwidget"><?php echo $instance['filter'] ? wpautop($text) : $text; ?></div>
+ <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div>
<?php
echo $after_widget;
}
@@ -391,7 +412,7 @@
if ( current_user_can('unfiltered_html') )
$instance['text'] = $new_instance['text'];
else
- $instance['text'] = wp_filter_post_kses( $new_instance['text'] );
+ $instance['text'] = stripslashes( wp_filter_post_kses( addslashes($new_instance['text']) ) ); // wp_filter_post_kses() expects slashed
$instance['filter'] = isset($new_instance['filter']);
return $instance;
}
@@ -399,14 +420,14 @@
function form( $instance ) {
$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>
<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>
<textarea class="widefat" rows="16" cols="20" id="<?php echo $this->get_field_id('text'); ?>" name="<?php echo $this->get_field_name('text'); ?>"><?php echo $text; ?></textarea>
- <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked($instance['filter']); ?> /> <label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs.'); ?></label></p>
+ <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> /> <label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
<?php
}
}
@@ -418,18 +439,18 @@
*/
class WP_Widget_Categories extends WP_Widget {
- function WP_Widget_Categories() {
+ function __construct() {
$widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories" ) );
- $this->WP_Widget('categories', __('Categories'), $widget_ops);
+ parent::__construct('categories', __('Categories'), $widget_ops);
}
function widget( $args, $instance ) {
extract( $args );
- $title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title']);
- $c = $instance['count'] ? '1' : '0';
- $h = $instance['hierarchical'] ? '1' : '0';
- $d = $instance['dropdown'] ? '1' : '0';
+ $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';
echo $before_widget;
if ( $title )
@@ -447,7 +468,7 @@
var dropdown = document.getElementById("cat");
function onCatChange() {
if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
- location.href = "<?php echo get_option('home'); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
+ location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
}
}
dropdown.onchange = onCatChange;
@@ -472,9 +493,9 @@
function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
- $instance['count'] = $new_instance['count'] ? 1 : 0;
- $instance['hierarchical'] = $new_instance['hierarchical'] ? 1 : 0;
- $instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0;
+ $instance['count'] = !empty($new_instance['count']) ? 1 : 0;
+ $instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
+ $instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
return $instance;
}
@@ -483,15 +504,15 @@
//Defaults
$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
$title = esc_attr( $instance['title'] );
- $count = (bool) $instance['count'];
- $hierarchical = (bool) $instance['hierarchical'];
- $dropdown = (bool) $instance['dropdown'];
+ $count = isset($instance['count']) ? (bool) $instance['count'] :false;
+ $hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;
+ $dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : 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><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 ); ?> />
<label for="<?php echo $this->get_field_id('count'); ?>"><?php _e( 'Show post counts' ); ?></label><br />
@@ -510,9 +531,9 @@
*/
class WP_Widget_Recent_Posts extends WP_Widget {
- function WP_Widget_Recent_Posts() {
- $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );
- $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops);
+ function __construct() {
+ $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") );
+ parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
$this->alt_option_name = 'widget_recent_entries';
add_action( 'save_post', array(&$this, 'flush_widget_cache') );
@@ -526,39 +547,40 @@
if ( !is_array($cache) )
$cache = array();
- if ( isset($cache[$args['widget_id']]) ) {
- echo $cache[$args['widget_id']];
+ if ( ! isset( $args['widget_id'] ) )
+ $args['widget_id'] = $this->id;
+
+ if ( isset( $cache[ $args['widget_id'] ] ) ) {
+ echo $cache[ $args['widget_id'] ];
return;
}
ob_start();
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Posts') : $instance['title']);
- if ( !$number = (int) $instance['number'] )
- $number = 10;
- else if ( $number < 1 )
- $number = 1;
- else if ( $number > 15 )
- $number = 15;
+ $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;
- $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
+ $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; ?>
<?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>
+ <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 endwhile; ?>
</ul>
<?php echo $after_widget; ?>
<?php
- wp_reset_query(); // Restore global post data stomped by the_post().
+ // Reset the global $the_post as this query will have stomped on it
+ wp_reset_postdata();
+
endif;
$cache[$args['widget_id']] = ob_get_flush();
- wp_cache_add('widget_recent_posts', $cache, 'widget');
+ wp_cache_set('widget_recent_posts', $cache, 'widget');
}
function update( $new_instance, $old_instance ) {
@@ -579,16 +601,14 @@
}
function form( $instance ) {
- $title = esc_attr($instance['title']);
- if ( !$number = (int) $instance['number'] )
- $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('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" /><br />
- <small><?php _e('(at most 15)'); ?></small></p>
+ <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
}
}
@@ -600,60 +620,77 @@
*/
class WP_Widget_Recent_Comments extends WP_Widget {
- function WP_Widget_Recent_Comments() {
+ function __construct() {
$widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'The most recent comments' ) );
- $this->WP_Widget('recent-comments', __('Recent Comments'), $widget_ops);
+ parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
$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( 'comment_post', array(&$this, 'flush_widget_cache') );
- add_action( 'wp_set_comment_status', array(&$this, 'flush_widget_cache') );
+ add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') );
}
- 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
}
function flush_widget_cache() {
- wp_cache_delete('recent_comments', 'widget');
+ wp_cache_delete('widget_recent_comments', 'widget');
}
function widget( $args, $instance ) {
- global $wpdb, $comments, $comment;
+ global $comments, $comment;
+
+ $cache = wp_cache_get('widget_recent_comments', 'widget');
+
+ if ( ! is_array( $cache ) )
+ $cache = array();
- extract($args, EXTR_SKIP);
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Recent Comments') : $instance['title']);
- if ( !$number = (int) $instance['number'] )
- $number = 5;
- else if ( $number < 1 )
- $number = 1;
- else if ( $number > 15 )
- $number = 15;
+ if ( ! isset( $args['widget_id'] ) )
+ $args['widget_id'] = $this->id;
- if ( !$comments = wp_cache_get( 'recent_comments', 'widget' ) ) {
- $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 15");
- wp_cache_add( 'recent_comments', $comments, 'widget' );
+ if ( isset( $cache[ $args['widget_id'] ] ) ) {
+ echo $cache[ $args['widget_id'] ];
+ return;
}
- $comments = array_slice( (array) $comments, 0, $number );
-?>
- <?php echo $before_widget; ?>
- <?php if ( $title ) echo $before_title . $title . $after_title; ?>
- <ul id="recentcomments"><?php
- if ( $comments ) : foreach ( (array) $comments as $comment) :
- echo '<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>';
- endforeach; endif;?></ul>
- <?php echo $after_widget; ?>
-<?php
+ 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;
+
+ $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;
+
+ $output .= '<ul id="recentcomments">';
+ if ( $comments ) {
+ 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');
}
function update( $new_instance, $old_instance ) {
$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();
$alloptions = wp_cache_get( 'alloptions', 'options' );
@@ -671,8 +708,7 @@
<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" /><br />
- <small><?php _e('(at most 15)'); ?></small></p>
+ <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
}
}
@@ -682,12 +718,12 @@
*
* @since 2.8.0
*/
-class WP_Widget_RSS_Sam extends WP_Widget {
+class WP_Widget_RSS extends WP_Widget {
- function WP_Widget_RSS_Sam() {
- $widget_ops = array( 'description' => __('Entries from any RSS Custom / SAM') );
+ function __construct() {
+ $widget_ops = array( 'description' => __('Entries from any RSS or Atom feed') );
$control_ops = array( 'width' => 400, 'height' => 200 );
- $this->WP_Widget( 'rss', __('RSS'), $widget_ops, $control_ops );
+ parent::__construct( 'rss', __('RSS'), $widget_ops, $control_ops );
}
function widget($args, $instance) {
@@ -697,13 +733,17 @@
extract($args, EXTR_SKIP);
- $url = $instance['url'];
+ $url = ! empty( $instance['url'] ) ? $instance['url'] : '';
while ( stristr($url, 'http') != $url )
$url = substr($url, 1);
if ( empty($url) )
return;
+ // self-url destruction sequence
+ if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
+ return;
+
$rss = fetch_feed($url);
$title = $instance['title'];
$desc = '';
@@ -721,94 +761,25 @@
if ( empty($title) )
$title = empty($desc) ? __('Unknown Feed') : $desc;
- $title = apply_filters('widget_title', $title );
+ $title = apply_filters('widget_title', $title, $instance, $this->id_base);
$url = esc_url(strip_tags($url));
$icon = includes_url('images/rss.png');
if ( $title )
- $title = "$title";
+ $title = "<a class='rsswidget' href='$url' title='" . esc_attr__( 'Syndicate this content' ) ."'><img style='border:0' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";
echo $before_widget;
if ( $title )
echo $before_title . $title . $after_title;
wp_widget_rss_output( $rss, $instance );
echo $after_widget;
+
+ if ( ! is_wp_error($rss) )
+ $rss->__destruct();
+ unset($rss);
}
function update($new_instance, $old_instance) {
- $testurl = $new_instance['url'] != $old_instance['url'];
- return wp_widget_rss_process( $new_instance, $testurl );
- }
-
- function form($instance) {
-
- if ( empty($instance) )
- $instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 );
- $instance['number'] = $this->number;
-
- wp_widget_rss_form( $instance );
- }
-}
-
-
-/**
- * RSS widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_RSS extends WP_Widget {
-
- function WP_Widget_RSS() {
- $widget_ops = array( 'description' => __('Entries from any RSS or Atom feed') );
- $control_ops = array( 'width' => 400, 'height' => 200 );
- $this->WP_Widget( 'rss', __('RSS'), $widget_ops, $control_ops );
- }
-
- function widget($args, $instance) {
-
- if ( isset($instance['error']) && $instance['error'] )
- return;
-
- extract($args, EXTR_SKIP);
-
- $url = $instance['url'];
- while ( stristr($url, 'http') != $url )
- $url = substr($url, 1);
-
- if ( empty($url) )
- return;
-
- $rss = fetch_feed($url);
- $title = $instance['title'];
- $desc = '';
- $link = '';
-
- if ( ! is_wp_error($rss) ) {
- $desc = esc_attr(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
- if ( empty($title) )
- $title = esc_html(strip_tags($rss->get_title()));
- $link = esc_url(strip_tags($rss->get_permalink()));
- while ( stristr($link, 'http') != $link )
- $link = substr($link, 1);
- }
-
- if ( empty($title) )
- $title = empty($desc) ? __('Unknown Feed') : $desc;
-
- $title = apply_filters('widget_title', $title );
- $url = esc_url(strip_tags($url));
- $icon = includes_url('images/rss.png');
- if ( $title )
- $title = "<a class='rsswidget' target='_blank' href='$url' title='" . esc_attr(__('Syndicate this content')) ."'><img style='background:orange;color:white;border:none;' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";
-
- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
- wp_widget_rss_output( $rss, $instance );
- echo $after_widget;
- }
-
- function update($new_instance, $old_instance) {
- $testurl = $new_instance['url'] != $old_instance['url'];
+ $testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
return wp_widget_rss_process( $new_instance, $testurl );
}
@@ -843,7 +814,6 @@
if ( is_wp_error($rss) ) {
if ( is_admin() || current_user_can('manage_options') )
echo '<p>' . sprintf( __('<strong>RSS Error</strong>: %s'), $rss->get_error_message() ) . '</p>';
-
return;
}
@@ -860,6 +830,8 @@
if ( !$rss->get_item_quantity() ) {
echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
+ $rss->__destruct();
+ unset($rss);
return;
}
@@ -873,8 +845,15 @@
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 = wp_html_excerpt( $desc, 360 ) . ' […]';
+ $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
+ $desc = wp_html_excerpt( $desc, 360 );
+
+ // Append ellipsis. Change existing [...] to […].
+ if ( '[...]' == substr( $desc, -5 ) )
+ $desc = substr( $desc, 0, -5 ) . '[…]';
+ elseif ( '[…]' != substr( $desc, -10 ) )
+ $desc .= ' […]';
+
$desc = esc_html( $desc );
if ( $show_summary ) {
@@ -885,13 +864,10 @@
$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>';
}
}
@@ -907,14 +883,14 @@
if ( $link == '' ) {
echo "<li>$title{$date}{$summary}{$author}</li>";
} else {
- echo "<li><a class='rsswidget' href='$link' title='$desc' target='_blank'>$title</a>{$date}{$summary}{$author}</li>";
+ echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$summary}{$author}</li>";
}
}
echo '</ul>';
+ $rss->__destruct();
+ unset($rss);
}
-
-
/**
* Display RSS widget options form.
*
@@ -1005,9 +981,9 @@
$items = 10;
$url = esc_url_raw(strip_tags( $widget_rss['url'] ));
$title = trim(strip_tags( $widget_rss['title'] ));
- $show_summary = (int) $widget_rss['show_summary'];
- $show_author = (int) $widget_rss['show_author'];
- $show_date = (int) $widget_rss['show_date'];
+ $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);
@@ -1019,6 +995,9 @@
$link = esc_url(strip_tags($rss->get_permalink()));
while ( stristr($link, 'http') != $link )
$link = substr($link, 1);
+
+ $rss->__destruct();
+ unset($rss);
}
}
@@ -1032,34 +1011,132 @@
*/
class WP_Widget_Tag_Cloud extends WP_Widget {
- function WP_Widget_Tag_Cloud() {
+ function __construct() {
$widget_ops = array( 'description' => __( "Your most used tags in cloud format") );
- $this->WP_Widget('tag_cloud', __('Tag Cloud'), $widget_ops);
+ parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
}
function widget( $args, $instance ) {
extract($args);
- $title = apply_filters('widget_title', empty($instance['title']) ? __('Tags') : $instance['title']);
+ $current_taxonomy = $this->_get_current_taxonomy($instance);
+ if ( !empty($instance['title']) ) {
+ $title = $instance['title'];
+ } else {
+ if ( 'post_tag' == $current_taxonomy ) {
+ $title = __('Tags');
+ } else {
+ $tax = get_taxonomy($current_taxonomy);
+ $title = $tax->labels->name;
+ }
+ }
+ $title = apply_filters('widget_title', $title, $instance, $this->id_base);
echo $before_widget;
if ( $title )
echo $before_title . $title . $after_title;
- echo '<div>';
- wp_tag_cloud(apply_filters('widget_tag_cloud_args', array()));
+ echo '<div class="tagcloud">';
+ wp_tag_cloud( apply_filters('widget_tag_cloud_args', array('taxonomy' => $current_taxonomy) ) );
echo "</div>\n";
echo $after_widget;
}
function update( $new_instance, $old_instance ) {
$instance['title'] = strip_tags(stripslashes($new_instance['title']));
+ $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
return $instance;
}
function form( $instance ) {
+ $current_taxonomy = $this->_get_current_taxonomy($instance);
?>
<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
- <input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr( $instance['title'] ); ?>" /></p>
-<?php
+ <input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php if (isset ( $instance['title'])) {echo esc_attr( $instance['title'] );} ?>" /></p>
+ <p><label for="<?php echo $this->get_field_id('taxonomy'); ?>"><?php _e('Taxonomy:') ?></label>
+ <select class="widefat" id="<?php echo $this->get_field_id('taxonomy'); ?>" name="<?php echo $this->get_field_name('taxonomy'); ?>">
+ <?php foreach ( get_taxonomies() as $taxonomy ) :
+ $tax = get_taxonomy($taxonomy);
+ if ( !$tax->show_tagcloud || empty($tax->labels->name) )
+ continue;
+ ?>
+ <option value="<?php echo esc_attr($taxonomy) ?>" <?php selected($taxonomy, $current_taxonomy) ?>><?php echo $tax->labels->name; ?></option>
+ <?php endforeach; ?>
+ </select></p><?php
+ }
+
+ function _get_current_taxonomy($instance) {
+ if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
+ return $instance['taxonomy'];
+
+ return 'post_tag';
+ }
+}
+
+/**
+ * Navigation Menu widget class
+ *
+ * @since 3.0.0
+ */
+ 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.') );
+ parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
+ }
+
+ function widget($args, $instance) {
+ // Get menu
+ $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
+
+ if ( !$nav_menu )
+ return;
+
+ $instance['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+
+ echo $args['before_widget'];
+
+ if ( !empty($instance['title']) )
+ echo $args['before_title'] . $instance['title'] . $args['after_title'];
+
+ wp_nav_menu( array( 'fallback_cb' => '', 'menu' => $nav_menu ) );
+
+ echo $args['after_widget'];
+ }
+
+ function update( $new_instance, $old_instance ) {
+ $instance['title'] = strip_tags( stripslashes($new_instance['title']) );
+ $instance['nav_menu'] = (int) $new_instance['nav_menu'];
+ return $instance;
+ }
+
+ function form( $instance ) {
+ $title = isset( $instance['title'] ) ? $instance['title'] : '';
+ $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
+
+ // Get menus
+ $menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+
+ // If no menus exists, direct the user to go and create some.
+ if ( !$menus ) {
+ echo '<p>'. sprintf( __('No menus have been created yet. <a href="%s">Create some</a>.'), admin_url('nav-menus.php') ) .'</p>';
+ return;
+ }
+ ?>
+ <p>
+ <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
+ <input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo $title; ?>" />
+ </p>
+ <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'); ?>">
+ <?php
+ foreach ( $menus as $menu ) {
+ $selected = $nav_menu == $menu->term_id ? ' selected="selected"' : '';
+ echo '<option'. $selected .' value="'. $menu->term_id .'">'. $menu->name .'</option>';
+ }
+ ?>
+ </select>
+ </p>
+ <?php
}
}
@@ -1096,11 +1173,11 @@
register_widget('WP_Widget_Recent_Comments');
register_widget('WP_Widget_RSS');
-
- register_widget('WP_Widget_RSS_Sam');
-
+
register_widget('WP_Widget_Tag_Cloud');
+ register_widget('WP_Nav_Menu_Widget');
+
do_action('widgets_init');
}