--- a/wp/wp-includes/default-widgets.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/default-widgets.php Tue Jun 09 03:35:32 2015 +0200
@@ -13,37 +13,61 @@
*/
class WP_Widget_Pages extends WP_Widget {
- function __construct() {
- $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'Your site’s WordPress Pages') );
+ public function __construct() {
+ $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 );
+ public function widget( $args, $instance ) {
- $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;
- if ( $title)
- echo $before_title . $title . $after_title;
+ if ( ! empty( $out ) ) {
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
?>
<ul>
<?php echo $out; ?>
</ul>
<?php
- echo $after_widget;
+ echo $args['after_widget'];
}
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) {
@@ -57,7 +81,7 @@
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
//Defaults
$instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
$title = esc_attr( $instance['title'] );
@@ -89,13 +113,12 @@
*/
class WP_Widget_Links extends WP_Widget {
- function __construct() {
+ public function __construct() {
$widget_ops = array('description' => __( "Your blogroll" ) );
parent::__construct('links', __('Links'), $widget_ops);
}
- function widget( $args, $instance ) {
- extract($args, EXTR_SKIP);
+ public function widget( $args, $instance ) {
$show_description = isset($instance['description']) ? $instance['description'] : false;
$show_name = isset($instance['name']) ? $instance['name'] : false;
@@ -106,19 +129,29 @@
$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(
- 'title_before' => $before_title, 'title_after' => $after_title,
- 'category_before' => $before_widget, 'category_after' => $after_widget,
+ $before_widget = preg_replace( '/id="[^"]*"/', 'id="%id"', $args['before_widget'] );
+
+ /**
+ * 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' => $args['before_title'], 'title_after' => $args['after_title'],
+ 'category_before' => $before_widget, 'category_after' => $args['after_widget'],
'show_images' => $show_images, 'show_description' => $show_description,
'show_name' => $show_name, 'show_rating' => $show_rating,
'category' => $category, 'class' => 'linkcat widget',
'orderby' => $orderby, 'order' => $order,
'limit' => $limit,
- )));
+ ) ) );
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$new_instance = (array) $new_instance;
$instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
foreach ( $instance as $field => $val ) {
@@ -136,7 +169,7 @@
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
//Defaults
$instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
@@ -189,26 +222,28 @@
*/
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);
+ public function __construct() {
+ $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);
+ public function widget( $args, $instance ) {
+
+ /** 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;
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
// Use current theme search form if it exists
get_search_form();
- echo $after_widget;
+ echo $args['after_widget'];
}
- function form( $instance ) {
+ public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
$title = $instance['title'];
?>
@@ -216,7 +251,7 @@
<?php
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
$instance['title'] = strip_tags($new_instance['title']);
@@ -232,37 +267,94 @@
*/
class WP_Widget_Archives extends WP_Widget {
- function __construct() {
- $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site’s posts') );
+ public 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);
+ public function widget( $args, $instance ) {
$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 )
- echo $before_title . $title . $after_title;
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
if ( $d ) {
+ $dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
?>
- <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>
+ <label class="screen-reader-text" for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo $title; ?></label>
+ <select id="<?php echo esc_attr( $dropdown_id ); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
+ <?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.
+ */
+ $dropdown_args = apply_filters( 'widget_archives_dropdown_args', array(
+ 'type' => 'monthly',
+ 'format' => 'option',
+ 'show_post_count' => $c
+ ) );
+
+ switch ( $dropdown_args['type'] ) {
+ case 'yearly':
+ $label = __( 'Select Year' );
+ break;
+ case 'monthly':
+ $label = __( 'Select Month' );
+ break;
+ case 'daily':
+ $label = __( 'Select Day' );
+ break;
+ case 'weekly':
+ $label = __( 'Select Week' );
+ break;
+ default:
+ $label = __( 'Select Post' );
+ break;
+ }
+ ?>
+
+ <option value=""><?php echo esc_attr( $label ); ?></option>
+ <?php wp_get_archives( $dropdown_args ); ?>
+
+ </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
}
- echo $after_widget;
+ echo $args['after_widget'];
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
$instance['title'] = strip_tags($new_instance['title']);
@@ -272,7 +364,7 @@
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
$title = strip_tags($instance['title']);
$count = $instance['count'] ? 'checked="checked"' : '';
@@ -297,43 +389,55 @@
*/
class WP_Widget_Meta extends WP_Widget {
- function __construct() {
- $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") );
+ public function __construct() {
+ $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Login, RSS, & 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);
+ public function widget( $args, $instance ) {
+
+ /** 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 )
- echo $before_title . $title . $after_title;
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
?>
<ul>
<?php wp_register(); ?>
<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>
- <?php echo apply_filters( 'widget_meta_poweredby', sprintf( '<li><a href="%s" title="%s">%s</a></li>',
- esc_url( __( 'http://wordpress.org/' ) ),
+ <li><a href="<?php bloginfo('rss2_url'); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+ <li><a href="<?php bloginfo('comments_rss2_url'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+<?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' )
- ) ); ?>
- <?php wp_meta(); ?>
+ ) );
+
+ wp_meta();
+?>
</ul>
<?php
- echo $after_widget;
+ echo $args['after_widget'];
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
$title = strip_tags($instance['title']);
?>
@@ -349,31 +453,34 @@
*/
class WP_Widget_Calendar extends WP_Widget {
- function __construct() {
- $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site’s posts') );
+ public 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'], $instance, $this->id_base);
- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
+ public function widget( $args, $instance ) {
+
+ /** 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 $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
echo '<div id="calendar_wrap">';
get_calendar();
echo '</div>';
- echo $after_widget;
+ echo $args['after_widget'];
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
$title = strip_tags($instance['title']);
?>
@@ -390,35 +497,47 @@
*/
class WP_Widget_Text extends WP_Widget {
- function __construct() {
- $widget_ops = array('classname' => 'widget_text', 'description' => __('Arbitrary text or HTML'));
+ public function __construct() {
+ $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);
+ public function widget( $args, $instance ) {
+
+ /** 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; } ?>
+ echo $args['before_widget'];
+ if ( ! empty( $title ) ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ } ?>
<div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div>
<?php
- echo $after_widget;
+ echo $args['after_widget'];
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
if ( current_user_can('unfiltered_html') )
$instance['text'] = $new_instance['text'];
else
$instance['text'] = stripslashes( wp_filter_post_kses( addslashes($new_instance['text']) ) ); // wp_filter_post_kses() expects slashed
- $instance['filter'] = isset($new_instance['filter']);
+ $instance['filter'] = ! empty( $new_instance['filter'] );
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) );
$title = strip_tags($instance['title']);
$text = esc_textarea($instance['text']);
@@ -440,39 +559,65 @@
*/
class WP_Widget_Categories extends WP_Widget {
- function __construct() {
- $widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories" ) );
+ public function __construct() {
+ $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 );
+ public function widget( $args, $instance ) {
- $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';
- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
- $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
+ $cat_args = array(
+ 'orderby' => 'name',
+ 'show_count' => $c,
+ 'hierarchical' => $h
+ );
if ( $d ) {
- $cat_args['show_option_none'] = __('Select Category');
- wp_dropdown_categories(apply_filters('widget_categories_dropdown_args', $cat_args));
+ static $first_dropdown = true;
+
+ $dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
+ $first_dropdown = false;
+
+ echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
+
+ $cat_args['show_option_none'] = __( 'Select Category' );
+ $cat_args['id'] = $dropdown_id;
+
+ /**
+ * 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'>
/* <![CDATA[ */
- var dropdown = document.getElementById("cat");
+(function() {
+ var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
function onCatChange() {
- if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
- location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
+ if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
+ location.href = "<?php echo home_url(); ?>/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
}
}
dropdown.onchange = onCatChange;
+})();
/* ]]> */
</script>
@@ -482,16 +627,24 @@
<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
}
- echo $after_widget;
+ echo $args['after_widget'];
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
$instance['count'] = !empty($new_instance['count']) ? 1 : 0;
@@ -501,7 +654,7 @@
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
//Defaults
$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
$title = esc_attr( $instance['title'] );
@@ -532,8 +685,8 @@
*/
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") );
+ public function __construct() {
+ $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "Your site’s most recent Posts.") );
parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
$this->alt_option_name = 'widget_recent_entries';
@@ -542,14 +695,19 @@
add_action( 'switch_theme', array($this, 'flush_widget_cache') );
}
- function widget($args, $instance) {
- $cache = wp_cache_get('widget_recent_posts', 'widget');
+ public function widget($args, $instance) {
+ $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'] ];
@@ -557,20 +715,39 @@
}
ob_start();
- extract($args);
$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'] ) : 10;
+
+ $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
if ( ! $number )
- $number = 10;
+ $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; ?>
- <?php if ( $title ) echo $before_title . $title . $after_title; ?>
+ <?php echo $args['before_widget']; ?>
+ <?php if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ } ?>
<ul>
<?php while ( $r->have_posts() ) : $r->the_post(); ?>
<li>
@@ -581,18 +758,22 @@
</li>
<?php endwhile; ?>
</ul>
- <?php echo $after_widget; ?>
+ <?php echo $args['after_widget']; ?>
<?php
// 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_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 ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
$instance['number'] = (int) $new_instance['number'];
@@ -606,11 +787,11 @@
return $instance;
}
- function flush_widget_cache() {
+ public function flush_widget_cache() {
wp_cache_delete('widget_recent_posts', 'widget');
}
- function form( $instance ) {
+ public function form( $instance ) {
$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;
@@ -634,8 +815,8 @@
*/
class WP_Widget_Recent_Comments extends WP_Widget {
- function __construct() {
- $widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'The most recent comments' ) );
+ public function __construct() {
+ $widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'Your site’s most recent comments.' ) );
parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
$this->alt_option_name = 'widget_recent_comments';
@@ -647,7 +828,16 @@
add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
}
- function recent_comments_style() {
+ public 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;
@@ -656,17 +846,20 @@
<?php
}
- function flush_widget_cache() {
+ public function flush_widget_cache() {
wp_cache_delete('widget_recent_comments', 'widget');
}
- function widget( $args, $instance ) {
+ public 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;
@@ -676,19 +869,36 @@
return;
}
- extract($args, EXTR_SKIP);
- $output = '';
+ $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;
+ $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;
+ /**
+ * Filter the arguments for the Recent Comments widget.
+ *
+ * @since 3.4.0
+ *
+ * @see WP_Comment_Query::query() for information on accepted arguments.
+ *
+ * @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'
+ ) ) );
+
+ $output .= $args['before_widget'];
+ if ( $title ) {
+ $output .= $args['before_title'] . $title . $args['after_title'];
+ }
$output .= '<ul id="recentcomments">';
if ( $comments ) {
@@ -697,18 +907,27 @@
_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>';
+ $output .= '<li class="recentcomments">';
+ /* translators: comments widget: 1: comment author, 2: post link */
+ $output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
+ '<span class="comment-author-link">' . get_comment_author_link() . '</span>',
+ '<a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
+ );
+ $output .= '</li>';
}
- }
+ }
$output .= '</ul>';
- $output .= $after_widget;
+ $output .= $args['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 ) {
+ public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
$instance['number'] = absint( $new_instance['number'] );
@@ -721,7 +940,7 @@
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
?>
@@ -741,19 +960,17 @@
*/
class WP_Widget_RSS extends WP_Widget {
- function __construct() {
- $widget_ops = array( 'description' => __('Entries from any RSS or Atom feed') );
+ public function __construct() {
+ $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 );
}
- function widget($args, $instance) {
+ public function widget($args, $instance) {
if ( isset($instance['error']) && $instance['error'] )
return;
- extract($args, EXTR_SKIP);
-
$url = ! empty( $instance['url'] ) ? $instance['url'] : '';
while ( stristr($url, 'http') != $url )
$url = substr($url, 1);
@@ -782,29 +999,32 @@
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 )
- $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>";
+ $title = "<a class='rsswidget' href='$url'><img style='border:0' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link'>$title</a>";
- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
wp_widget_rss_output( $rss, $instance );
- echo $after_widget;
+ echo $args['after_widget'];
if ( ! is_wp_error($rss) )
$rss->__destruct();
unset($rss);
}
- function update($new_instance, $old_instance) {
+ public function update($new_instance, $old_instance) {
$testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
return wp_widget_rss_process( $new_instance, $testurl );
}
- function form($instance) {
+ public function form($instance) {
if ( empty($instance) )
$instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 );
@@ -838,16 +1058,15 @@
return;
}
- $default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0 );
+ $default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0 );
$args = wp_parse_args( $args, $default_args );
- extract( $args, EXTR_SKIP );
- $items = (int) $items;
+ $items = (int) $args['items'];
if ( $items < 1 || 20 < $items )
$items = 10;
- $show_summary = (int) $show_summary;
- $show_author = (int) $show_author;
- $show_date = (int) $show_date;
+ $show_summary = (int) $args['show_summary'];
+ $show_author = (int) $args['show_author'];
+ $show_date = (int) $args['show_date'];
if ( !$rss->get_item_quantity() ) {
echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>';
@@ -857,30 +1076,31 @@
}
echo '<ul>';
- foreach ( $rss->get_items(0, $items) as $item ) {
+ foreach ( $rss->get_items( 0, $items ) as $item ) {
$link = $item->get_link();
- while ( stristr($link, 'http') != $link )
- $link = substr($link, 1);
- $link = esc_url(strip_tags($link));
- $title = esc_attr(strip_tags($item->get_title()));
- if ( empty($title) )
- $title = __('Untitled');
+ while ( stristr( $link, 'http' ) != $link ) {
+ $link = substr( $link, 1 );
+ }
+ $link = esc_url( strip_tags( $link ) );
- $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
- $excerpt = wp_html_excerpt( $desc, 360 );
+ $title = esc_html( trim( strip_tags( $item->get_title() ) ) );
+ if ( empty( $title ) ) {
+ $title = __( 'Untitled' );
+ }
- // Append ellipsis. Change existing [...] to […].
- if ( '[...]' == substr( $excerpt, -5 ) )
- $excerpt = substr( $excerpt, 0, -5 ) . '[…]';
- elseif ( '[…]' != substr( $excerpt, -10 ) && $desc != $excerpt )
- $excerpt .= ' […]';
+ $desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
+ $desc = esc_attr( wp_trim_words( $desc, 55, ' […]' ) );
+
+ $summary = '';
+ if ( $show_summary ) {
+ $summary = $desc;
- $excerpt = esc_html( $excerpt );
+ // Change existing [...] to […].
+ if ( '[...]' == substr( $summary, -5 ) ) {
+ $summary = substr( $summary, 0, -5 ) . '[…]';
+ }
- if ( $show_summary ) {
- $summary = "<div class='rssSummary'>$excerpt</div>";
- } else {
- $summary = '';
+ $summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
}
$date = '';
@@ -903,8 +1123,10 @@
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</a>{$date}{$author}</li>";
}
}
echo '</ul>';
@@ -925,56 +1147,58 @@
* @param array $inputs Override default display options.
*/
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 );
+
+ $args['number'] = esc_attr( $args['number'] );
+ $args['title'] = isset( $args['title'] ) ? esc_attr( $args['title'] ) : '';
+ $args['url'] = isset( $args['url'] ) ? esc_url( $args['url'] ) : '';
+ $args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
- $number = esc_attr( $number );
- $title = esc_attr( $title );
- $url = esc_url( $url );
- $items = (int) $items;
- if ( $items < 1 || 20 < $items )
- $items = 10;
- $show_summary = (int) $show_summary;
- $show_author = (int) $show_author;
- $show_date = (int) $show_date;
+ if ( $args['items'] < 1 || 20 < $args['items'] ) {
+ $args['items'] = 10;
+ }
- if ( !empty($error) )
- echo '<p class="widget-error"><strong>' . sprintf( __('RSS Error: %s'), $error) . '</strong></p>';
+ $args['show_summary'] = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
+ $args['show_author'] = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author'];
+ $args['show_date'] = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
+
+ if ( ! empty( $args['error'] ) ) {
+ echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '</strong></p>';
+ }
if ( $inputs['url'] ) :
?>
- <p><label for="rss-url-<?php echo $number; ?>"><?php _e('Enter the RSS feed URL here:'); ?></label>
- <input class="widefat" id="rss-url-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][url]" type="text" value="<?php echo $url; ?>" /></p>
+ <p><label for="rss-url-<?php echo $args['number']; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label>
+ <input class="widefat" id="rss-url-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][url]" type="text" value="<?php echo $args['url']; ?>" /></p>
<?php endif; if ( $inputs['title'] ) : ?>
- <p><label for="rss-title-<?php echo $number; ?>"><?php _e('Give the feed a title (optional):'); ?></label>
- <input class="widefat" id="rss-title-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][title]" type="text" value="<?php echo $title; ?>" /></p>
+ <p><label for="rss-title-<?php echo $args['number']; ?>"><?php _e( 'Give the feed a title (optional):' ); ?></label>
+ <input class="widefat" id="rss-title-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][title]" type="text" value="<?php echo $args['title']; ?>" /></p>
<?php endif; if ( $inputs['items'] ) : ?>
- <p><label for="rss-items-<?php echo $number; ?>"><?php _e('How many items would you like to display?'); ?></label>
- <select id="rss-items-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][items]">
+ <p><label for="rss-items-<?php echo $args['number']; ?>"><?php _e( 'How many items would you like to display?' ); ?></label>
+ <select id="rss-items-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][items]">
<?php
- for ( $i = 1; $i <= 20; ++$i )
- echo "<option value='$i' " . selected( $items, $i, false ) . ">$i</option>";
+ for ( $i = 1; $i <= 20; ++$i ) {
+ echo "<option value='$i' " . selected( $args['items'], $i, false ) . ">$i</option>";
+ }
?>
</select></p>
<?php endif; if ( $inputs['show_summary'] ) : ?>
- <p><input id="rss-show-summary-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][show_summary]" type="checkbox" value="1" <?php if ( $show_summary ) echo 'checked="checked"'; ?>/>
- <label for="rss-show-summary-<?php echo $number; ?>"><?php _e('Display item content?'); ?></label></p>
+ <p><input id="rss-show-summary-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][show_summary]" type="checkbox" value="1" <?php checked( $args['show_summary'] ); ?> />
+ <label for="rss-show-summary-<?php echo $args['number']; ?>"><?php _e( 'Display item content?' ); ?></label></p>
<?php endif; if ( $inputs['show_author'] ) : ?>
- <p><input id="rss-show-author-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][show_author]" type="checkbox" value="1" <?php if ( $show_author ) echo 'checked="checked"'; ?>/>
- <label for="rss-show-author-<?php echo $number; ?>"><?php _e('Display item author if available?'); ?></label></p>
+ <p><input id="rss-show-author-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][show_author]" type="checkbox" value="1" <?php checked( $args['show_author'] ); ?> />
+ <label for="rss-show-author-<?php echo $args['number']; ?>"><?php _e( 'Display item author if available?' ); ?></label></p>
<?php endif; if ( $inputs['show_date'] ) : ?>
- <p><input id="rss-show-date-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][show_date]" type="checkbox" value="1" <?php if ( $show_date ) echo 'checked="checked"'; ?>/>
- <label for="rss-show-date-<?php echo $number; ?>"><?php _e('Display item date?'); ?></label></p>
+ <p><input id="rss-show-date-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
+ <label for="rss-show-date-<?php echo $args['number']; ?>"><?php _e( 'Display item date?' ); ?></label></p>
<?php
endif;
foreach ( array_keys($default_inputs) as $input ) :
if ( 'hidden' === $inputs[$input] ) :
$id = str_replace( '_', '-', $input );
?>
- <input type="hidden" id="rss-<?php echo $id; ?>-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][<?php echo $input; ?>]" value="<?php echo $$input; ?>" />
+ <input type="hidden" id="rss-<?php echo $id; ?>-<?php echo $args['number']; ?>" name="widget-rss[<?php echo $args['number']; ?>][<?php echo $input; ?>]" value="<?php echo $args[ $input ]; ?>" />
<?php
endif;
endforeach;
@@ -1032,13 +1256,12 @@
*/
class WP_Widget_Tag_Cloud extends WP_Widget {
- function __construct() {
- $widget_ops = array( 'description' => __( "Your most used tags in cloud format") );
+ public function __construct() {
+ $widget_ops = array( 'description' => __( "A cloud of your most used tags.") );
parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
}
- function widget( $args, $instance ) {
- extract($args);
+ public function widget( $args, $instance ) {
$current_taxonomy = $this->_get_current_taxonomy($instance);
if ( !empty($instance['title']) ) {
$title = $instance['title'];
@@ -1050,24 +1273,42 @@
$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 $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
+ echo '<div class="tagcloud">';
- 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;
+ echo $args['after_widget'];
}
- function update( $new_instance, $old_instance ) {
+ public function update( $new_instance, $old_instance ) {
+ $instance = array();
$instance['title'] = strip_tags(stripslashes($new_instance['title']));
$instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$current_taxonomy = $this->_get_current_taxonomy($instance);
?>
<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
@@ -1084,7 +1325,7 @@
</select></p><?php
}
- function _get_current_taxonomy($instance) {
+ public function _get_current_taxonomy($instance) {
if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
return $instance['taxonomy'];
@@ -1099,18 +1340,19 @@
*/
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.') );
+ public function __construct() {
+ $widget_ops = array( 'description' => __('Add a custom menu to your sidebar.') );
parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
}
- function widget($args, $instance) {
+ public 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;
+ /** 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'];
@@ -1118,23 +1360,47 @@
if ( !empty($instance['title']) )
echo $args['before_title'] . $instance['title'] . $args['after_title'];
- wp_nav_menu( array( 'fallback_cb' => '', 'menu' => $nav_menu ) );
+ $nav_menu_args = array(
+ 'fallback_cb' => '',
+ 'menu' => $nav_menu
+ );
+
+ /**
+ * Filter the arguments for the Custom Menu widget.
+ *
+ * @since 4.2.0
+ *
+ * @param array $nav_menu_args {
+ * An array of arguments passed to wp_nav_menu() to retrieve a custom menu.
+ *
+ * @type callback|bool $fallback_cb Callback to fire if the menu doesn't exist. Default empty.
+ * @type mixed $menu Menu ID, slug, or name.
+ * }
+ * @param stdClass $nav_menu Nav menu object for the current menu.
+ * @param array $args Display arguments for the current widget.
+ */
+ wp_nav_menu( apply_filters( 'widget_nav_menu_args', $nav_menu_args, $nav_menu, $args ) );
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'];
+ public function update( $new_instance, $old_instance ) {
+ $instance = array();
+ if ( ! empty( $new_instance['title'] ) ) {
+ $instance['title'] = strip_tags( stripslashes($new_instance['title']) );
+ }
+ if ( ! empty( $new_instance['nav_menu'] ) ) {
+ $instance['nav_menu'] = (int) $new_instance['nav_menu'];
+ }
return $instance;
}
- function form( $instance ) {
+ public function form( $instance ) {
$title = isset( $instance['title'] ) ? $instance['title'] : '';
$nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
// Get menus
- $menus = wp_get_nav_menus( array( 'orderby' => 'name' ) );
+ $menus = wp_get_nav_menus();
// If no menus exists, direct the user to go and create some.
if ( !$menus ) {
@@ -1149,11 +1415,12 @@
<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( '— Select —' ) ?></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>
@@ -1201,7 +1468,12 @@
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);