X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-includes/default-widgets.php?ds=sidebyside
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index d54dbc73..22e61e53 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -18,6 +18,10 @@ class WP_Widget_Pages extends WP_Widget {
parent::__construct('pages', __('Pages'), $widget_ops);
}
+ /**
+ * @param array $args
+ * @param array $instance
+ */
public function widget( $args, $instance ) {
/**
@@ -67,6 +71,11 @@ class WP_Widget_Pages extends WP_Widget {
}
}
+ /**
+ * @param array $new_instance
+ * @param array $old_instance
+ * @return array
+ */
public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']);
@@ -81,6 +90,9 @@ class WP_Widget_Pages extends WP_Widget {
return $instance;
}
+ /**
+ * @param array $instance
+ */
public function form( $instance ) {
//Defaults
$instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
@@ -118,8 +130,11 @@ class WP_Widget_Links extends WP_Widget {
parent::__construct('links', __('Links'), $widget_ops);
}
+ /**
+ * @param array $args
+ * @param array $instance
+ */
public function widget( $args, $instance ) {
-
$show_description = isset($instance['description']) ? $instance['description'] : false;
$show_name = isset($instance['name']) ? $instance['name'] : false;
$show_rating = isset($instance['rating']) ? $instance['rating'] : false;
@@ -151,6 +166,11 @@ class WP_Widget_Links extends WP_Widget {
) ) );
}
+ /**
+ * @param array $new_instance
+ * @param array $old_instance
+ * @return array
+ */
public function update( $new_instance, $old_instance ) {
$new_instance = (array) $new_instance;
$instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
@@ -169,6 +189,9 @@ class WP_Widget_Links extends WP_Widget {
return $instance;
}
+ /**
+ * @param array $instance
+ */
public function form( $instance ) {
//Defaults
@@ -227,8 +250,11 @@ class WP_Widget_Search extends WP_Widget {
parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops );
}
+ /**
+ * @param array $args
+ * @param array $instance
+ */
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 );
@@ -243,6 +269,9 @@ class WP_Widget_Search extends WP_Widget {
echo $args['after_widget'];
}
+ /**
+ * @param array $instance
+ */
public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
$title = $instance['title'];
@@ -251,6 +280,11 @@ class WP_Widget_Search extends WP_Widget {
''));
@@ -272,6 +306,10 @@ class WP_Widget_Archives extends WP_Widget {
parent::__construct('archives', __('Archives'), $widget_ops);
}
+ /**
+ * @param array $args
+ * @param array $instance
+ */
public function widget( $args, $instance ) {
$c = ! empty( $instance['count'] ) ? '1' : '0';
$d = ! empty( $instance['dropdown'] ) ? '1' : '0';
@@ -285,10 +323,10 @@ class WP_Widget_Archives extends WP_Widget {
}
if ( $d ) {
+ $dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
?>
-
'', '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'];
}
+ /**
+ * @param array $new_instance
+ * @param array $old_instance
+ * @return array
+ */
public function update( $new_instance, $old_instance ) {
$instance = array();
if ( ! empty( $new_instance['title'] ) ) {
@@ -1339,36 +1559,46 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
return $instance;
}
+ /**
+ * @param array $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 ) {
- echo ''. sprintf( __('No menus have been created yet. Create some.'), admin_url('nav-menus.php') ) .'
';
- return;
- }
?>
-
-
-
-
-
-
-
+ ?>
+ Create some.' ), esc_attr( $url ) ); ?>
+