<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[33843] trunk/src/wp-includes: Move widget classes to their own files in `wp-includes/widgets`:</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33843">33843</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33843","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-01 13:49:00 +0000 (Tue, 01 Sep 2015)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Move widget classes to their own files in `wp-includes/widgets`:

* `default-widgets.php` now requires all of the individual classes
* Move the functions scattered about this file to `widget-functions.php`, which loads before `default-widgets.php`, which only conditionally loads anyway in `wp_maybe_load_widgets()`, which is hooked on `plugins_loaded` 

See <a href="https://core.trac.wordpress.org/ticket/33413">#33413</a>, <a href="https://core.trac.wordpress.org/ticket/23012">#23012</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultwidgetsphp">trunk/src/wp-includes/default-widgets.php</a></li>
<li><a href="#trunksrcwpincludeswidgetfunctionsphp">trunk/src/wp-includes/widget-functions.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/src/wp-includes/widgets/</li>
<li><a href="#trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp">trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetarchivesphp">trunk/src/wp-includes/widgets/class-wp-widget-archives.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetcalendarphp">trunk/src/wp-includes/widgets/class-wp-widget-calendar.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetcategoriesphp">trunk/src/wp-includes/widgets/class-wp-widget-categories.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetlinksphp">trunk/src/wp-includes/widgets/class-wp-widget-links.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmetaphp">trunk/src/wp-includes/widgets/class-wp-widget-meta.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetpagesphp">trunk/src/wp-includes/widgets/class-wp-widget-pages.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrecentcommentsphp">trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrecentpostsphp">trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrssphp">trunk/src/wp-includes/widgets/class-wp-widget-rss.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetsearchphp">trunk/src/wp-includes/widgets/class-wp-widget-search.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettagcloudphp">trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-widgets.php 2015-09-01 13:45:15 UTC (rev 33842)
+++ trunk/src/wp-includes/default-widgets.php   2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,1641 +6,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Widgets
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * Pages widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Pages extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'A list of your site&#8217;s Pages.') );
-               parent::__construct('pages', __('Pages'), $widget_ops);
-       }
-
-       /**
-        * @param array $args
-        * @param array $instance
-        */
-       public function widget( $args, $instance ) {
-
-               /**
-                * 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';
-
-               /**
-                * 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 $args['before_widget'];
-                       if ( $title ) {
-                               echo $args['before_title'] . $title . $args['after_title'];
-                       }
-               ?>
-               <ul>
-                       <?php echo $out; ?>
-               </ul>
-               <?php
-                       echo $args['after_widget'];
-               }
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-               if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) {
-                       $instance['sortby'] = $new_instance['sortby'];
-               } else {
-                       $instance['sortby'] = 'menu_order';
-               }
-
-               $instance['exclude'] = sanitize_text_field( $new_instance['exclude'] );
-
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               //Defaults
-               $instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
-       ?>
-               <p>
-                       <label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:' ); ?></label>
-                       <input class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
-               </p>
-               <p>
-                       <label for="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>"><?php _e( 'Sort by:' ); ?></label>
-                       <select name="<?php echo esc_attr( $this->get_field_name( 'sortby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>" class="widefat">
-                               <option value="post_title"<?php selected( $instance['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option>
-                               <option value="menu_order"<?php selected( $instance['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option>
-                               <option value="ID"<?php selected( $instance['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option>
-                       </select>
-               </p>
-               <p>
-                       <label for="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>"><?php _e( 'Exclude:' ); ?></label>
-                       <input type="text" value="<?php echo esc_attr( $instance['exclude'] ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'exclude' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>" class="widefat" />
-                       <br />
-                       <small><?php _e( 'Page IDs, separated by commas.' ); ?></small>
-               </p>
-<?php
-       }
-
-}
-
-/**
- * Links widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Links extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('description' => __( "Your blogroll" ) );
-               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;
-               $show_images = isset($instance['images']) ? $instance['images'] : true;
-               $category = isset($instance['category']) ? $instance['category'] : false;
-               $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"', $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,
-               ) ) );
-       }
-
-       /**
-        * @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 );
-               foreach ( $instance as $field => $val ) {
-                       if ( isset($new_instance[$field]) )
-                               $instance[$field] = 1;
-               }
-
-               $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;
-       }
-
-       /**
-        * @param array $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 ) );
-               $link_cats = get_terms( 'link_category' );
-               if ( ! $limit = intval( $instance['limit'] ) )
-                       $limit = -1;
-?>
-               <p>
-               <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 _ex('All Links', 'links widget'); ?></option>
-               <?php
-               foreach ( $link_cats as $link_cat ) {
-                       echo '<option value="' . intval( $link_cat->term_id ) . '"'
-                               . selected( $instance['category'], $link_cat->term_id, false )
-                               . '>' . $link_cat->name . "</option>\n";
-               }
-               ?>
-               </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 _ex( 'Random', 'Links widget' ); ?></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 />
-               <input class="checkbox" type="checkbox" <?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" />
-               <label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br />
-               <input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" />
-               <label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br />
-               <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
-       }
-}
-
-/**
- * Search widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Search extends WP_Widget {
-
-       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 );
-       }
-
-       /**
-        * @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 );
-
-               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 $args['after_widget'];
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-               $title = $instance['title'];
-?>
-               <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <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); ?>" /></label></p>
-<?php
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-               return $instance;
-       }
-
-}
-
-/**
- * Archives widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Archives extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site&#8217;s Posts.') );
-               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';
-
-               /** 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 $args['before_widget'];
-               if ( $title ) {
-                       echo $args['before_title'] . $title . $args['after_title'];
-               }
-
-               if ( $d ) {
-                       $dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
-?>
-               <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
-               /**
-                * 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 $args['after_widget'];
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       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'] = sanitize_text_field( $new_instance['title'] );
-               $instance['count'] = $new_instance['count'] ? 1 : 0;
-               $instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0;
-
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
-               $title = sanitize_text_field( $instance['title'] );
-?>
-               <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 checked( $instance['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 checked( $instance['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>
-               </p>
-<?php
-       }
-}
-
-/**
- * Meta widget class
- *
- * Displays log in/out, RSS feed links, etc.
- *
- * @since 2.8.0
- */
-class WP_Widget_Meta extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Login, RSS, &amp; WordPress.org links.") );
-               parent::__construct('meta', __('Meta'), $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']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base );
-
-               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 echo esc_url( get_bloginfo( 'rss2_url' ) ); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-                       <li><a href="<?php echo esc_url( get_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' )
-                       ) );
-
-                       wp_meta();
-?>
-                       </ul>
-<?php
-               echo $args['after_widget'];
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-               $title = sanitize_text_field( $instance['title'] );
-?>
-                       <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>
-<?php
-       }
-}
-
-/**
- * Calendar widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Calendar extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s Posts.') );
-               parent::__construct('calendar', __('Calendar'), $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 );
-
-               echo $args['before_widget'];
-               if ( $title ) {
-                       echo $args['before_title'] . $title . $args['after_title'];
-               }
-               echo '<div id="calendar_wrap">';
-               get_calendar();
-               echo '</div>';
-               echo $args['after_widget'];
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-               $title = sanitize_text_field( $instance['title'] );
-?>
-               <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>
-<?php
-       }
-}
-
-/**
- * Text widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Text extends WP_Widget {
-
-       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);
-       }
-
-       /**
-        * @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 );
-
-               /**
-                * 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 $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 $args['after_widget'];
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-               if ( current_user_can('unfiltered_html') )
-                       $instance['text'] =  $new_instance['text'];
-               else
-                       $instance['text'] = wp_kses_post( stripslashes( $new_instance['text'] ) );
-               $instance['filter'] = ! empty( $new_instance['filter'] );
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) );
-               $filter = isset( $instance['filter'] ) ? $instance['filter'] : 0;
-               $title = sanitize_text_field( $instance['title'] );
-               ?>
-               <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><label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>
-               <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 esc_textarea( $instance['text'] ); ?></textarea></p>
-
-               <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked( $filter ); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
-<?php
-       }
-}
-
-/**
- * Categories widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Categories extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories." ) );
-               parent::__construct('categories', __('Categories'), $widget_ops);
-       }
-
-       /**
-        * @staticvar bool $first_dropdown
-        *
-        * @param array $args
-        * @param array $instance
-        */
-       public function widget( $args, $instance ) {
-               static $first_dropdown = true;
-
-               /** 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 $args['before_widget'];
-               if ( $title ) {
-                       echo $args['before_title'] . $title . $args['after_title'];
-               }
-
-               $cat_args = array(
-                       'orderby'      => 'name',
-                       'show_count'   => $c,
-                       'hierarchical' => $h
-               );
-
-               if ( $d ) {
-                       $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[ */
-(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;
-               }
-       }
-       dropdown.onchange = onCatChange;
-})();
-/* ]]> */
-</script>
-
-<?php
-               } else {
-?>
-               <ul>
-<?php
-               $cat_args['title_li'] = '';
-
-               /**
-                * 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 $args['after_widget'];
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-               $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;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               //Defaults
-               $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-               $title = sanitize_text_field( $instance['title'] );
-               $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 esc_attr( $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( '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 />
-
-               <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> />
-               <label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
-<?php
-       }
-
-}
-
-/**
- * Recent_Posts widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Recent_Posts extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "Your site&#8217;s most recent Posts.") );
-               parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
-               $this->alt_option_name = 'widget_recent_entries';
-
-               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') );
-       }
-
-       /**
-        * @param array $args
-        * @param array $instance
-        */
-       public function widget( $args, $instance ) {
-               $cache = array();
-               if ( ! $this->is_preview() ) {
-                       $cache = wp_cache_get( 'widget_recent_posts', 'widget' );
-               }
-
-               if ( ! is_array( $cache ) ) {
-                       $cache = array();
-               }
-
-               if ( ! isset( $args['widget_id'] ) ) {
-                       $args['widget_id'] = $this->id;
-               }
-
-               if ( isset( $cache[ $args['widget_id'] ] ) ) {
-                       echo $cache[ $args['widget_id'] ];
-                       return;
-               }
-
-               ob_start();
-
-               $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' );
-
-               /** This filter is documented in wp-includes/default-widgets.php */
-               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
-
-               $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-               if ( ! $number )
-                       $number = 5;
-               $show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false;
-
-               /**
-                * 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 $args['before_widget']; ?>
-               <?php if ( $title ) {
-                       echo $args['before_title'] . $title . $args['after_title'];
-               } ?>
-               <ul>
-               <?php while ( $r->have_posts() ) : $r->the_post(); ?>
-                       <li>
-                               <a href="<?php the_permalink(); ?>"><?php get_the_title() ? the_title() : the_ID(); ?></a>
-                       <?php if ( $show_date ) : ?>
-                               <span class="post-date"><?php echo get_the_date(); ?></span>
-                       <?php endif; ?>
-                       </li>
-               <?php endwhile; ?>
-               </ul>
-               <?php echo $args['after_widget']; ?>
-<?php
-               // Reset the global $the_post as this query will have stomped on it
-               wp_reset_postdata();
-
-               endif;
-
-               if ( ! $this->is_preview() ) {
-                       $cache[ $args['widget_id'] ] = ob_get_flush();
-                       wp_cache_set( 'widget_recent_posts', $cache, 'widget' );
-               } else {
-                       ob_end_flush();
-               }
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = santize_text_field( $new_instance['title'] );
-               $instance['number'] = (int) $new_instance['number'];
-               $instance['show_date'] = isset( $new_instance['show_date'] ) ? (bool) $new_instance['show_date'] : false;
-               $this->flush_widget_cache();
-
-               $alloptions = wp_cache_get( 'alloptions', 'options' );
-               if ( isset($alloptions['widget_recent_entries']) )
-                       delete_option('widget_recent_entries');
-
-               return $instance;
-       }
-
-       /**
-        * @access public
-        */
-       public function flush_widget_cache() {
-               wp_cache_delete('widget_recent_posts', 'widget');
-       }
-
-       /**
-        * @param array $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;
-?>
-               <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><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
-       }
-}
-
-/**
- * Recent_Comments widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Recent_Comments extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'Your site&#8217;s most recent comments.' ) );
-               parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
-               $this->alt_option_name = 'widget_recent_comments';
-
-               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( 'edit_comment', array($this, 'flush_widget_cache') );
-               add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
-       }
-
-       /**
-        * @access public
-        */
-       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;
-               ?>
-       <style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
-<?php
-       }
-
-       /**
-        * @access public
-        */
-       public function flush_widget_cache() {
-               wp_cache_delete('widget_recent_comments', 'widget');
-       }
-
-       /**
-        * @param array $args
-        * @param array $instance
-        */
-       public function widget( $args, $instance ) {
-               $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;
-
-               if ( isset( $cache[ $args['widget_id'] ] ) ) {
-                       echo $cache[ $args['widget_id'] ];
-                       return;
-               }
-
-               $output = '';
-
-               $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
-
-               /** This filter is documented in wp-includes/default-widgets.php */
-               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
-
-               $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-               if ( ! $number )
-                       $number = 5;
-
-               /**
-                * Filter the arguments for the Recent Comments widget.
-                *
-                * @since 3.4.0
-                *
-                * @see 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 ( is_array( $comments ) && $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 */
-                               $output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
-                                       '<span class="comment-author-link">' . get_comment_author_link( $comment->comment_ID ) . '</span>',
-                                       '<a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
-                               );
-                               $output .= '</li>';
-                       }
-               }
-               $output .= '</ul>';
-               $output .= $args['after_widget'];
-
-               echo $output;
-
-               if ( ! $this->is_preview() ) {
-                       $cache[ $args['widget_id'] ] = $output;
-                       wp_cache_set( 'widget_recent_comments', $cache, 'widget' );
-               }
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = $old_instance;
-               $instance['title'] = sanitize_text_field( $new_instance['title'] );
-               $instance['number'] = absint( $new_instance['number'] );
-               $this->flush_widget_cache();
-
-               $alloptions = wp_cache_get( 'alloptions', 'options' );
-               if ( isset($alloptions['widget_recent_comments']) )
-                       delete_option('widget_recent_comments');
-
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $title = isset( $instance['title'] ) ? $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 esc_attr( $title ); ?>" /></p>
-
-               <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
-               <input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
-<?php
-       }
-}
-
-/**
- * RSS widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_RSS extends WP_Widget {
-
-       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 );
-       }
-
-       /**
-        * @param array $args
-        * @param array $instance
-        */
-       public function widget( $args, $instance ) {
-               if ( isset($instance['error']) && $instance['error'] )
-                       return;
-
-               $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 = '';
-               $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 = strip_tags( $rss->get_title() );
-                       $link = strip_tags( $rss->get_permalink() );
-                       while ( stristr($link, 'http') != $link )
-                               $link = substr($link, 1);
-               }
-
-               if ( empty($title) )
-                       $title = empty($desc) ? __('Unknown Feed') : $desc;
-
-               /** This filter is documented in wp-includes/default-widgets.php */
-               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
-
-               $url = strip_tags( $url );
-               $icon = includes_url( 'images/rss.png' );
-               if ( $title )
-                       $title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">"'. esc_html( $title ) .'"</a>';
-
-               echo $args['before_widget'];
-               if ( $title ) {
-                       echo $args['before_title'] . $title . $args['after_title'];
-               }
-               wp_widget_rss_output( $rss, $instance );
-               echo $args['after_widget'];
-
-               if ( ! is_wp_error($rss) )
-                       $rss->__destruct();
-               unset($rss);
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       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 );
-       }
-
-       /**
-        * @param array $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 );
-               }
-               $instance['number'] = $this->number;
-
-               wp_widget_rss_form( $instance );
-       }
-}
-
-/**
- * Display the RSS entries in a list.
- *
- * @since 2.5.0
- *
- * @param string|array|object $rss RSS url.
- * @param array $args Widget arguments.
- */
-function wp_widget_rss_output( $rss, $args = array() ) {
-       if ( is_string( $rss ) ) {
-               $rss = fetch_feed($rss);
-       } elseif ( is_array($rss) && isset($rss['url']) ) {
-               $args = $rss;
-               $rss = fetch_feed($rss['url']);
-       } elseif ( !is_object($rss) ) {
-               return;
-       }
-
-       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;
-       }
-
-       $default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0 );
-       $args = wp_parse_args( $args, $default_args );
-
-       $items = (int) $args['items'];
-       if ( $items < 1 || 20 < $items )
-               $items = 10;
-       $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>';
-               $rss->__destruct();
-               unset($rss);
-               return;
-       }
-
-       echo '<ul>';
-       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_html( trim( strip_tags( $item->get_title() ) ) );
-               if ( empty( $title ) ) {
-                       $title = __( 'Untitled' );
-               }
-
-               $desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
-               $desc = esc_attr( wp_trim_words( $desc, 55, ' [&hellip;]' ) );
-
-               $summary = '';
-               if ( $show_summary ) {
-                       $summary = $desc;
-
-                       // Change existing [...] to [&hellip;].
-                       if ( '[...]' == substr( $summary, -5 ) ) {
-                               $summary = substr( $summary, 0, -5 ) . '[&hellip;]';
-                       }
-
-                       $summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
-               }
-
-               $date = '';
-               if ( $show_date ) {
-                       $date = $item->get_date( 'U' );
-
-                       if ( $date ) {
-                               $date = ' <span class="rss-date">' . date_i18n( get_option( 'date_format' ), $date ) . '</span>';
-                       }
-               }
-
-               $author = '';
-               if ( $show_author ) {
-                       $author = $item->get_author();
-                       if ( is_object($author) ) {
-                               $author = $author->get_name();
-                               $author = ' <cite>' . esc_html( strip_tags( $author ) ) . '</cite>';
-                       }
-               }
-
-               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</a>{$date}{$author}</li>";
-               }
-       }
-       echo '</ul>';
-       $rss->__destruct();
-       unset($rss);
-}
-
-/**
- * Display RSS widget options form.
- *
- * The options for what fields are displayed for the RSS form are all booleans
- * and are as follows: 'url', 'title', 'items', 'show_summary', 'show_author',
- * 'show_date'.
- *
- * @since 2.5.0
- *
- * @param array|string $args Values for input fields.
- * @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 );
-
-       $args['title'] = isset( $args['title'] ) ? $args['title'] : '';
-       $args['url'] = isset( $args['url'] ) ? $args['url'] : '';
-       $args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
-
-       if ( $args['items'] < 1 || 20 < $args['items'] ) {
-               $args['items'] = 10;
-       }
-
-       $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>';
-       }
-
-       $esc_number = esc_attr( $args['number'] );
-       if ( $inputs['url'] ) :
-?>
-       <p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label>
-       <input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url( $args['url'] ); ?>" /></p>
-<?php endif; if ( $inputs['title'] ) : ?>
-       <p><label for="rss-title-<?php echo $esc_number; ?>"><?php _e( 'Give the feed a title (optional):' ); ?></label>
-       <input class="widefat" id="rss-title-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][title]" type="text" value="<?php echo esc_attr( $args['title'] ); ?>" /></p>
-<?php endif; if ( $inputs['items'] ) : ?>
-       <p><label for="rss-items-<?php echo $esc_number; ?>"><?php _e( 'How many items would you like to display?' ); ?></label>
-       <select id="rss-items-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][items]">
-       <?php
-       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 $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_summary]" type="checkbox" value="1" <?php checked( $args['show_summary'] ); ?> />
-       <label for="rss-show-summary-<?php echo $esc_number; ?>"><?php _e( 'Display item content?' ); ?></label></p>
-<?php endif; if ( $inputs['show_author'] ) : ?>
-       <p><input id="rss-show-author-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_author]" type="checkbox" value="1" <?php checked( $args['show_author'] ); ?> />
-       <label for="rss-show-author-<?php echo $esc_number; ?>"><?php _e( 'Display item author if available?' ); ?></label></p>
-<?php endif; if ( $inputs['show_date'] ) : ?>
-       <p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
-       <label for="rss-show-date-<?php echo $esc_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 esc_attr( $id ); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr( $input ); ?>]" value="<?php echo esc_attr( $args[ $input ] ); ?>" />
-<?php
-               endif;
-       endforeach;
-}
-
-/**
- * Process RSS feed widget data and optionally retrieve feed items.
- *
- * The feed widget can not have more than 20 items or it will reset back to the
- * default, which is 10.
- *
- * The resulting array has the feed title, feed url, feed link (from channel),
- * feed items, error (if any), and whether to show summary, author, and date.
- * All respectively in the order of the array elements.
- *
- * @since 2.5.0
- *
- * @param array $widget_rss RSS widget feed data. Expects unescaped data.
- * @param bool $check_feed Optional, default is true. Whether to check feed for errors.
- * @return array
- */
-function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
-       $items = (int) $widget_rss['items'];
-       if ( $items < 1 || 20 < $items )
-               $items = 10;
-       $url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
-       $title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
-       $show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
-       $show_author   = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0;
-       $show_date     = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
-
-       if ( $check_feed ) {
-               $rss = fetch_feed($url);
-               $error = false;
-               $link = '';
-               if ( is_wp_error($rss) ) {
-                       $error = $rss->get_error_message();
-               } else {
-                       $link = esc_url(strip_tags($rss->get_permalink()));
-                       while ( stristr($link, 'http') != $link )
-                               $link = substr($link, 1);
-
-                       $rss->__destruct();
-                       unset($rss);
-               }
-       }
-
-       return compact( 'title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date' );
-}
-
-/**
- * Tag cloud widget class
- *
- * @since 2.8.0
- */
-class WP_Widget_Tag_Cloud extends WP_Widget {
-
-       public function __construct() {
-               $widget_ops = array( 'description' => __( "A cloud of your most used tags.") );
-               parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
-       }
-
-       /**
-        * @param array $args
-        * @param array $instance
-        */
-       public function widget( $args, $instance ) {
-               $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;
-                       }
-               }
-
-               /** 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">';
-
-               /**
-                * 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 $args['after_widget'];
-       }
-
-       /**
-        * @param array $new_instance
-        * @param array $old_instance
-        * @return array
-        */
-       public function update( $new_instance, $old_instance ) {
-               $instance = array();
-               $instance['title'] = sanitize_text_field( stripslashes( $new_instance['title'] ) );
-               $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
-               return $instance;
-       }
-
-       /**
-        * @param array $instance
-        */
-       public function form( $instance ) {
-               $current_taxonomy = $this->_get_current_taxonomy($instance);
-               $title = isset( $instance['title'] ) ? $instance['title'] : '';
-?>
-       <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( $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 esc_attr( $tax->labels->name ); ?></option>
-       <?php endforeach; ?>
-       </select></p><?php
-       }
-
-       /**
-        * @param array $instance
-        * @return string
-        */
-       public 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 {
-
-       public function __construct() {
-               $widget_ops = array( 'description' => __('Add a custom menu to your sidebar.') );
-               parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
-       }
-
-       /**
-        * @param array $args
-        * @param array $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'];
-
-               if ( !empty($instance['title']) )
-                       echo $args['before_title'] . $instance['title'] . $args['after_title'];
-
-               $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'] ) ) {
-                       $instance['title'] = sanitize_text_field( stripslashes( $new_instance['title'] ) );
-               }
-               if ( ! empty( $new_instance['nav_menu'] ) ) {
-                       $instance['nav_menu'] = (int) $new_instance['nav_menu'];
-               }
-               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();
-
-               // If no menus exists, direct the user to go and create some.
-               ?>
-               <p class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>>
-                       <?php
-                       if ( isset( $GLOBALS['wp_customize'] ) && $GLOBALS['wp_customize'] instanceof WP_Customize_Manager ) {
-                               $url = 'javascript: wp.customize.panel( "nav_menus" ).focus();';
-                       } else {
-                               $url = admin_url( 'nav-menus.php' );
-                       }
-                       ?>
-                       <?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?>
-               </p>
-               <div class="nav-menu-widget-form-controls" <?php if ( empty( $menus ) ) { echo ' style="display:none" '; } ?>>
-                       <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( $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' ); ?>">
-                                       <option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-                                       <?php foreach ( $menus as $menu ) : ?>
-                                               <option value="<?php echo esc_attr( $menu->term_id ); ?>" <?php selected( $nav_menu, $menu->term_id ); ?>>
-                                                       <?php echo esc_html( $menu->name ); ?>
-                                               </option>
-                                       <?php endforeach; ?>
-                               </select>
-                       </p>
-               </div>
-               <?php
-       }
-}
-
-/**
- * Register all of the default WordPress widgets on startup.
- *
- * Calls 'widgets_init' action after all of the WordPress widgets have been
- * registered.
- *
- * @since 2.2.0
- */
-function wp_widgets_init() {
-       if ( !is_blog_installed() )
-               return;
-
-       register_widget('WP_Widget_Pages');
-
-       register_widget('WP_Widget_Calendar');
-
-       register_widget('WP_Widget_Archives');
-
-       if ( get_option( 'link_manager_enabled' ) )
-               register_widget('WP_Widget_Links');
-
-       register_widget('WP_Widget_Meta');
-
-       register_widget('WP_Widget_Search');
-
-       register_widget('WP_Widget_Text');
-
-       register_widget('WP_Widget_Categories');
-
-       register_widget('WP_Widget_Recent_Posts');
-
-       register_widget('WP_Widget_Recent_Comments');
-
-       register_widget('WP_Widget_RSS');
-
-       register_widget('WP_Widget_Tag_Cloud');
-
-       register_widget('WP_Nav_Menu_Widget');
-
-       /**
-        * Fires after all default WordPress widgets have been registered.
-        *
-        * @since 2.2.0
-        */
-       do_action( 'widgets_init' );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-pages.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-links.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-search.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-archives.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-meta.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-calendar.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-text.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-categories.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-recent-posts.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-recent-comments.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-rss.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-tag-cloud.php' );
+require_once( ABSPATH . WPINC . '/widgets/class-wp-nav-menu-widget.php' );
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widget-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widget-functions.php        2015-09-01 13:45:15 UTC (rev 33842)
+++ trunk/src/wp-includes/widget-functions.php  2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,3 +1095,265 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        return $sidebars_widgets;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Display the RSS entries in a list.
+ *
+ * @since 2.5.0
+ *
+ * @param string|array|object $rss RSS url.
+ * @param array $args Widget arguments.
+ */
+function wp_widget_rss_output( $rss, $args = array() ) {
+       if ( is_string( $rss ) ) {
+               $rss = fetch_feed($rss);
+       } elseif ( is_array($rss) && isset($rss['url']) ) {
+               $args = $rss;
+               $rss = fetch_feed($rss['url']);
+       } elseif ( !is_object($rss) ) {
+               return;
+       }
+
+       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;
+       }
+
+       $default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0 );
+       $args = wp_parse_args( $args, $default_args );
+
+       $items = (int) $args['items'];
+       if ( $items < 1 || 20 < $items )
+               $items = 10;
+       $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>';
+               $rss->__destruct();
+               unset($rss);
+               return;
+       }
+
+       echo '<ul>';
+       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_html( trim( strip_tags( $item->get_title() ) ) );
+               if ( empty( $title ) ) {
+                       $title = __( 'Untitled' );
+               }
+
+               $desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
+               $desc = esc_attr( wp_trim_words( $desc, 55, ' [&hellip;]' ) );
+
+               $summary = '';
+               if ( $show_summary ) {
+                       $summary = $desc;
+
+                       // Change existing [...] to [&hellip;].
+                       if ( '[...]' == substr( $summary, -5 ) ) {
+                               $summary = substr( $summary, 0, -5 ) . '[&hellip;]';
+                       }
+
+                       $summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
+               }
+
+               $date = '';
+               if ( $show_date ) {
+                       $date = $item->get_date( 'U' );
+
+                       if ( $date ) {
+                               $date = ' <span class="rss-date">' . date_i18n( get_option( 'date_format' ), $date ) . '</span>';
+                       }
+               }
+
+               $author = '';
+               if ( $show_author ) {
+                       $author = $item->get_author();
+                       if ( is_object($author) ) {
+                               $author = $author->get_name();
+                               $author = ' <cite>' . esc_html( strip_tags( $author ) ) . '</cite>';
+                       }
+               }
+
+               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</a>{$date}{$author}</li>";
+               }
+       }
+       echo '</ul>';
+       $rss->__destruct();
+       unset($rss);
+}
+
+/**
+ * Display RSS widget options form.
+ *
+ * The options for what fields are displayed for the RSS form are all booleans
+ * and are as follows: 'url', 'title', 'items', 'show_summary', 'show_author',
+ * 'show_date'.
+ *
+ * @since 2.5.0
+ *
+ * @param array|string $args Values for input fields.
+ * @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 );
+
+       $args['title'] = isset( $args['title'] ) ? $args['title'] : '';
+       $args['url'] = isset( $args['url'] ) ? $args['url'] : '';
+       $args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
+
+       if ( $args['items'] < 1 || 20 < $args['items'] ) {
+               $args['items'] = 10;
+       }
+
+       $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>';
+       }
+
+       $esc_number = esc_attr( $args['number'] );
+       if ( $inputs['url'] ) :
+?>
+       <p><label for="rss-url-<?php echo $esc_number; ?>"><?php _e( 'Enter the RSS feed URL here:' ); ?></label>
+       <input class="widefat" id="rss-url-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][url]" type="text" value="<?php echo esc_url( $args['url'] ); ?>" /></p>
+<?php endif; if ( $inputs['title'] ) : ?>
+       <p><label for="rss-title-<?php echo $esc_number; ?>"><?php _e( 'Give the feed a title (optional):' ); ?></label>
+       <input class="widefat" id="rss-title-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][title]" type="text" value="<?php echo esc_attr( $args['title'] ); ?>" /></p>
+<?php endif; if ( $inputs['items'] ) : ?>
+       <p><label for="rss-items-<?php echo $esc_number; ?>"><?php _e( 'How many items would you like to display?' ); ?></label>
+       <select id="rss-items-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][items]">
+       <?php
+       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 $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_summary]" type="checkbox" value="1" <?php checked( $args['show_summary'] ); ?> />
+       <label for="rss-show-summary-<?php echo $esc_number; ?>"><?php _e( 'Display item content?' ); ?></label></p>
+<?php endif; if ( $inputs['show_author'] ) : ?>
+       <p><input id="rss-show-author-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_author]" type="checkbox" value="1" <?php checked( $args['show_author'] ); ?> />
+       <label for="rss-show-author-<?php echo $esc_number; ?>"><?php _e( 'Display item author if available?' ); ?></label></p>
+<?php endif; if ( $inputs['show_date'] ) : ?>
+       <p><input id="rss-show-date-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][show_date]" type="checkbox" value="1" <?php checked( $args['show_date'] ); ?>/>
+       <label for="rss-show-date-<?php echo $esc_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 esc_attr( $id ); ?>-<?php echo $esc_number; ?>" name="widget-rss[<?php echo $esc_number; ?>][<?php echo esc_attr( $input ); ?>]" value="<?php echo esc_attr( $args[ $input ] ); ?>" />
+<?php
+               endif;
+       endforeach;
+}
+
+/**
+ * Process RSS feed widget data and optionally retrieve feed items.
+ *
+ * The feed widget can not have more than 20 items or it will reset back to the
+ * default, which is 10.
+ *
+ * The resulting array has the feed title, feed url, feed link (from channel),
+ * feed items, error (if any), and whether to show summary, author, and date.
+ * All respectively in the order of the array elements.
+ *
+ * @since 2.5.0
+ *
+ * @param array $widget_rss RSS widget feed data. Expects unescaped data.
+ * @param bool $check_feed Optional, default is true. Whether to check feed for errors.
+ * @return array
+ */
+function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
+       $items = (int) $widget_rss['items'];
+       if ( $items < 1 || 20 < $items )
+               $items = 10;
+       $url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
+       $title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
+       $show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
+       $show_author   = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0;
+       $show_date     = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
+
+       if ( $check_feed ) {
+               $rss = fetch_feed($url);
+               $error = false;
+               $link = '';
+               if ( is_wp_error($rss) ) {
+                       $error = $rss->get_error_message();
+               } else {
+                       $link = esc_url(strip_tags($rss->get_permalink()));
+                       while ( stristr($link, 'http') != $link )
+                               $link = substr($link, 1);
+
+                       $rss->__destruct();
+                       unset($rss);
+               }
+       }
+
+       return compact( 'title', 'url', 'link', 'items', 'error', 'show_summary', 'show_author', 'show_date' );
+}
+
+/**
+ * Register all of the default WordPress widgets on startup.
+ *
+ * Calls 'widgets_init' action after all of the WordPress widgets have been
+ * registered.
+ *
+ * @since 2.2.0
+ */
+function wp_widgets_init() {
+       if ( !is_blog_installed() )
+               return;
+
+       register_widget('WP_Widget_Pages');
+
+       register_widget('WP_Widget_Calendar');
+
+       register_widget('WP_Widget_Archives');
+
+       if ( get_option( 'link_manager_enabled' ) )
+               register_widget('WP_Widget_Links');
+
+       register_widget('WP_Widget_Meta');
+
+       register_widget('WP_Widget_Search');
+
+       register_widget('WP_Widget_Text');
+
+       register_widget('WP_Widget_Categories');
+
+       register_widget('WP_Widget_Recent_Posts');
+
+       register_widget('WP_Widget_Recent_Comments');
+
+       register_widget('WP_Widget_RSS');
+
+       register_widget('WP_Widget_Tag_Cloud');
+
+       register_widget('WP_Nav_Menu_Widget');
+
+       /**
+        * Fires after all default WordPress widgets have been registered.
+        *
+        * @since 2.2.0
+        */
+       do_action( 'widgets_init' );
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpnavmenuwidgetphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php                                (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php  2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,116 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Navigation Menu widget class
+ *
+ * @since 3.0.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+ class WP_Nav_Menu_Widget extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array( 'description' => __('Add a custom menu to your sidebar.') );
+               parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
+       }
+
+       /**
+        * @param array $args
+        * @param array $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'];
+
+               if ( !empty($instance['title']) )
+                       echo $args['before_title'] . $instance['title'] . $args['after_title'];
+
+               $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'] ) ) {
+                       $instance['title'] = sanitize_text_field( stripslashes( $new_instance['title'] ) );
+               }
+               if ( ! empty( $new_instance['nav_menu'] ) ) {
+                       $instance['nav_menu'] = (int) $new_instance['nav_menu'];
+               }
+               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();
+
+               // If no menus exists, direct the user to go and create some.
+               ?>
+               <p class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>>
+                       <?php
+                       if ( isset( $GLOBALS['wp_customize'] ) && $GLOBALS['wp_customize'] instanceof WP_Customize_Manager ) {
+                               $url = 'javascript: wp.customize.panel( "nav_menus" ).focus();';
+                       } else {
+                               $url = admin_url( 'nav-menus.php' );
+                       }
+                       ?>
+                       <?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?>
+               </p>
+               <div class="nav-menu-widget-form-controls" <?php if ( empty( $menus ) ) { echo ' style="display:none" '; } ?>>
+                       <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( $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' ); ?>">
+                                       <option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+                                       <?php foreach ( $menus as $menu ) : ?>
+                                               <option value="<?php echo esc_attr( $menu->term_id ); ?>" <?php selected( $nav_menu, $menu->term_id ); ?>>
+                                                       <?php echo esc_html( $menu->name ); ?>
+                                               </option>
+                                       <?php endforeach; ?>
+                               </select>
+                       </p>
+               </div>
+               <?php
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetarchivesphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-archives.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-archives.php                                (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-archives.php  2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,132 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Archives widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Archives extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site&#8217;s Posts.') );
+               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';
+
+               /** 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 $args['before_widget'];
+               if ( $title ) {
+                       echo $args['before_title'] . $title . $args['after_title'];
+               }
+
+               if ( $d ) {
+                       $dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
+?>
+               <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
+               /**
+                * 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 $args['after_widget'];
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       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'] = sanitize_text_field( $new_instance['title'] );
+               $instance['count'] = $new_instance['count'] ? 1 : 0;
+               $instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0;
+
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
+               $title = sanitize_text_field( $instance['title'] );
+?>
+               <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 checked( $instance['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 checked( $instance['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>
+               </p>
+<?php
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetcalendarphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-calendar.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-calendar.php                                (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-calendar.php  2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,57 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Calendar widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Calendar extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s Posts.') );
+               parent::__construct('calendar', __('Calendar'), $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 );
+
+               echo $args['before_widget'];
+               if ( $title ) {
+                       echo $args['before_title'] . $title . $args['after_title'];
+               }
+               echo '<div id="calendar_wrap">';
+               get_calendar();
+               echo '</div>';
+               echo $args['after_widget'];
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+               $title = sanitize_text_field( $instance['title'] );
+?>
+               <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>
+<?php
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetcategoriesphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-categories.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-categories.php                              (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-categories.php        2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,141 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Categories widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Categories extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array( 'classname' => 'widget_categories', 'description' => __( "A list or dropdown of categories." ) );
+               parent::__construct('categories', __('Categories'), $widget_ops);
+       }
+
+       /**
+        * @staticvar bool $first_dropdown
+        *
+        * @param array $args
+        * @param array $instance
+        */
+       public function widget( $args, $instance ) {
+               static $first_dropdown = true;
+
+               /** 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 $args['before_widget'];
+               if ( $title ) {
+                       echo $args['before_title'] . $title . $args['after_title'];
+               }
+
+               $cat_args = array(
+                       'orderby'      => 'name',
+                       'show_count'   => $c,
+                       'hierarchical' => $h
+               );
+
+               if ( $d ) {
+                       $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[ */
+(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;
+               }
+       }
+       dropdown.onchange = onCatChange;
+})();
+/* ]]> */
+</script>
+
+<?php
+               } else {
+?>
+               <ul>
+<?php
+               $cat_args['title_li'] = '';
+
+               /**
+                * 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 $args['after_widget'];
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+               $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;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               //Defaults
+               $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
+               $title = sanitize_text_field( $instance['title'] );
+               $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 esc_attr( $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( '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 />
+
+               <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> />
+               <label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
+<?php
+       }
+
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetlinksphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-links.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-links.php                           (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-links.php     2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,122 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Links widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Links extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('description' => __( "Your blogroll" ) );
+               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;
+               $show_images = isset($instance['images']) ? $instance['images'] : true;
+               $category = isset($instance['category']) ? $instance['category'] : false;
+               $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"', $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,
+               ) ) );
+       }
+
+       /**
+        * @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 );
+               foreach ( $instance as $field => $val ) {
+                       if ( isset($new_instance[$field]) )
+                               $instance[$field] = 1;
+               }
+
+               $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;
+       }
+
+       /**
+        * @param array $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 ) );
+               $link_cats = get_terms( 'link_category' );
+               if ( ! $limit = intval( $instance['limit'] ) )
+                       $limit = -1;
+?>
+               <p>
+               <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 _ex('All Links', 'links widget'); ?></option>
+               <?php
+               foreach ( $link_cats as $link_cat ) {
+                       echo '<option value="' . intval( $link_cat->term_id ) . '"'
+                               . selected( $instance['category'], $link_cat->term_id, false )
+                               . '>' . $link_cat->name . "</option>\n";
+               }
+               ?>
+               </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 _ex( 'Random', 'Links widget' ); ?></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 />
+               <input class="checkbox" type="checkbox" <?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" />
+               <label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br />
+               <input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" />
+               <label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br />
+               <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
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmetaphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-meta.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-meta.php                            (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-meta.php      2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,79 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Meta widget class
+ *
+ * Displays log in/out, RSS feed links, etc.
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Meta extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Login, RSS, &amp; WordPress.org links.") );
+               parent::__construct('meta', __('Meta'), $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']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base );
+
+               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 echo esc_url( get_bloginfo( 'rss2_url' ) ); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+                       <li><a href="<?php echo esc_url( get_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' )
+                       ) );
+
+                       wp_meta();
+?>
+                       </ul>
+<?php
+               echo $args['after_widget'];
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+               $title = sanitize_text_field( $instance['title'] );
+?>
+                       <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>
+<?php
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetpagesphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-pages.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-pages.php                           (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-pages.php     2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,116 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Pages widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Pages extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('classname' => 'widget_pages', 'description' => __( 'A list of your site&#8217;s Pages.') );
+               parent::__construct('pages', __('Pages'), $widget_ops);
+       }
+
+       /**
+        * @param array $args
+        * @param array $instance
+        */
+       public function widget( $args, $instance ) {
+
+               /**
+                * 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';
+
+               /**
+                * 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 $args['before_widget'];
+                       if ( $title ) {
+                               echo $args['before_title'] . $title . $args['after_title'];
+                       }
+               ?>
+               <ul>
+                       <?php echo $out; ?>
+               </ul>
+               <?php
+                       echo $args['after_widget'];
+               }
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+               if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) {
+                       $instance['sortby'] = $new_instance['sortby'];
+               } else {
+                       $instance['sortby'] = 'menu_order';
+               }
+
+               $instance['exclude'] = sanitize_text_field( $new_instance['exclude'] );
+
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               //Defaults
+               $instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
+       ?>
+               <p>
+                       <label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:' ); ?></label>
+                       <input class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
+               </p>
+               <p>
+                       <label for="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>"><?php _e( 'Sort by:' ); ?></label>
+                       <select name="<?php echo esc_attr( $this->get_field_name( 'sortby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>" class="widefat">
+                               <option value="post_title"<?php selected( $instance['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option>
+                               <option value="menu_order"<?php selected( $instance['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option>
+                               <option value="ID"<?php selected( $instance['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option>
+                       </select>
+               </p>
+               <p>
+                       <label for="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>"><?php _e( 'Exclude:' ); ?></label>
+                       <input type="text" value="<?php echo esc_attr( $instance['exclude'] ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'exclude' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'exclude' ) ); ?>" class="widefat" />
+                       <br />
+                       <small><?php _e( 'Page IDs, separated by commas.' ); ?></small>
+               </p>
+<?php
+       }
+
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetrecentcommentsphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php                         (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php   2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,162 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Recent_Comments widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Recent_Comments extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('classname' => 'widget_recent_comments', 'description' => __( 'Your site&#8217;s most recent comments.' ) );
+               parent::__construct('recent-comments', __('Recent Comments'), $widget_ops);
+               $this->alt_option_name = 'widget_recent_comments';
+
+               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( 'edit_comment', array($this, 'flush_widget_cache') );
+               add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
+       }
+
+       /**
+        * @access public
+        */
+       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;
+               ?>
+       <style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
+<?php
+       }
+
+       /**
+        * @access public
+        */
+       public function flush_widget_cache() {
+               wp_cache_delete('widget_recent_comments', 'widget');
+       }
+
+       /**
+        * @param array $args
+        * @param array $instance
+        */
+       public function widget( $args, $instance ) {
+               $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;
+
+               if ( isset( $cache[ $args['widget_id'] ] ) ) {
+                       echo $cache[ $args['widget_id'] ];
+                       return;
+               }
+
+               $output = '';
+
+               $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
+
+               /** This filter is documented in wp-includes/default-widgets.php */
+               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+               $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
+               if ( ! $number )
+                       $number = 5;
+
+               /**
+                * Filter the arguments for the Recent Comments widget.
+                *
+                * @since 3.4.0
+                *
+                * @see 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 ( is_array( $comments ) && $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 */
+                               $output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
+                                       '<span class="comment-author-link">' . get_comment_author_link( $comment->comment_ID ) . '</span>',
+                                       '<a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
+                               );
+                               $output .= '</li>';
+                       }
+               }
+               $output .= '</ul>';
+               $output .= $args['after_widget'];
+
+               echo $output;
+
+               if ( ! $this->is_preview() ) {
+                       $cache[ $args['widget_id'] ] = $output;
+                       wp_cache_set( 'widget_recent_comments', $cache, 'widget' );
+               }
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+               $instance['number'] = absint( $new_instance['number'] );
+               $this->flush_widget_cache();
+
+               $alloptions = wp_cache_get( 'alloptions', 'options' );
+               if ( isset($alloptions['widget_recent_comments']) )
+                       delete_option('widget_recent_comments');
+
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $title = isset( $instance['title'] ) ? $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 esc_attr( $title ); ?>" /></p>
+
+               <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of comments to show:' ); ?></label>
+               <input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
+<?php
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetrecentpostsphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.php                            (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-recent-posts.php      2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,147 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Recent_Posts widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Recent_Posts extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "Your site&#8217;s most recent Posts.") );
+               parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
+               $this->alt_option_name = 'widget_recent_entries';
+
+               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') );
+       }
+
+       /**
+        * @param array $args
+        * @param array $instance
+        */
+       public function widget( $args, $instance ) {
+               $cache = array();
+               if ( ! $this->is_preview() ) {
+                       $cache = wp_cache_get( 'widget_recent_posts', 'widget' );
+               }
+
+               if ( ! is_array( $cache ) ) {
+                       $cache = array();
+               }
+
+               if ( ! isset( $args['widget_id'] ) ) {
+                       $args['widget_id'] = $this->id;
+               }
+
+               if ( isset( $cache[ $args['widget_id'] ] ) ) {
+                       echo $cache[ $args['widget_id'] ];
+                       return;
+               }
+
+               ob_start();
+
+               $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' );
+
+               /** This filter is documented in wp-includes/default-widgets.php */
+               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+               $number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
+               if ( ! $number )
+                       $number = 5;
+               $show_date = isset( $instance['show_date'] ) ? $instance['show_date'] : false;
+
+               /**
+                * 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 $args['before_widget']; ?>
+               <?php if ( $title ) {
+                       echo $args['before_title'] . $title . $args['after_title'];
+               } ?>
+               <ul>
+               <?php while ( $r->have_posts() ) : $r->the_post(); ?>
+                       <li>
+                               <a href="<?php the_permalink(); ?>"><?php get_the_title() ? the_title() : the_ID(); ?></a>
+                       <?php if ( $show_date ) : ?>
+                               <span class="post-date"><?php echo get_the_date(); ?></span>
+                       <?php endif; ?>
+                       </li>
+               <?php endwhile; ?>
+               </ul>
+               <?php echo $args['after_widget']; ?>
+<?php
+               // Reset the global $the_post as this query will have stomped on it
+               wp_reset_postdata();
+
+               endif;
+
+               if ( ! $this->is_preview() ) {
+                       $cache[ $args['widget_id'] ] = ob_get_flush();
+                       wp_cache_set( 'widget_recent_posts', $cache, 'widget' );
+               } else {
+                       ob_end_flush();
+               }
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = santize_text_field( $new_instance['title'] );
+               $instance['number'] = (int) $new_instance['number'];
+               $instance['show_date'] = isset( $new_instance['show_date'] ) ? (bool) $new_instance['show_date'] : false;
+               $this->flush_widget_cache();
+
+               $alloptions = wp_cache_get( 'alloptions', 'options' );
+               if ( isset($alloptions['widget_recent_entries']) )
+                       delete_option('widget_recent_entries');
+
+               return $instance;
+       }
+
+       /**
+        * @access public
+        */
+       public function flush_widget_cache() {
+               wp_cache_delete('widget_recent_posts', 'widget');
+       }
+
+       /**
+        * @param array $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;
+?>
+               <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><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
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetrssphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-rss.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-rss.php                             (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-rss.php       2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,94 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * RSS widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_RSS extends WP_Widget {
+
+       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 );
+       }
+
+       /**
+        * @param array $args
+        * @param array $instance
+        */
+       public function widget( $args, $instance ) {
+               if ( isset($instance['error']) && $instance['error'] )
+                       return;
+
+               $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 = '';
+               $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 = strip_tags( $rss->get_title() );
+                       $link = strip_tags( $rss->get_permalink() );
+                       while ( stristr($link, 'http') != $link )
+                               $link = substr($link, 1);
+               }
+
+               if ( empty($title) )
+                       $title = empty($desc) ? __('Unknown Feed') : $desc;
+
+               /** This filter is documented in wp-includes/default-widgets.php */
+               $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+
+               $url = strip_tags( $url );
+               $icon = includes_url( 'images/rss.png' );
+               if ( $title )
+                       $title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">"'. esc_html( $title ) .'"</a>';
+
+               echo $args['before_widget'];
+               if ( $title ) {
+                       echo $args['before_title'] . $title . $args['after_title'];
+               }
+               wp_widget_rss_output( $rss, $instance );
+               echo $args['after_widget'];
+
+               if ( ! is_wp_error($rss) )
+                       $rss->__destruct();
+               unset($rss);
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       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 );
+       }
+
+       /**
+        * @param array $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 );
+               }
+               $instance['number'] = $this->number;
+
+               wp_widget_rss_form( $instance );
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetsearchphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-search.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-search.php                          (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-search.php    2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,58 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Search widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Search extends WP_Widget {
+
+       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 );
+       }
+
+       /**
+        * @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 );
+
+               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 $args['after_widget'];
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
+               $title = $instance['title'];
+?>
+               <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <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); ?>" /></label></p>
+<?php
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+               return $instance;
+       }
+
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettagcloudphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php                               (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-tag-cloud.php 2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,103 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Tag cloud widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Tag_Cloud extends WP_Widget {
+
+       public function __construct() {
+               $widget_ops = array( 'description' => __( "A cloud of your most used tags.") );
+               parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
+       }
+
+       /**
+        * @param array $args
+        * @param array $instance
+        */
+       public function widget( $args, $instance ) {
+               $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;
+                       }
+               }
+
+               /** 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">';
+
+               /**
+                * 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 $args['after_widget'];
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = array();
+               $instance['title'] = sanitize_text_field( stripslashes( $new_instance['title'] ) );
+               $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $current_taxonomy = $this->_get_current_taxonomy($instance);
+               $title = isset( $instance['title'] ) ? $instance['title'] : '';
+?>
+       <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( $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 esc_attr( $tax->labels->name ); ?></option>
+       <?php endforeach; ?>
+       </select></p><?php
+       }
+
+       /**
+        * @param array $instance
+        * @return string
+        */
+       public function _get_current_taxonomy($instance) {
+               if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
+                       return $instance['taxonomy'];
+
+               return 'post_tag';
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettextphpfromrev33841trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-includes/widgets/class-wp-widget-text.php (from rev 33841, trunk/src/wp-includes/default-widgets.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-text.php                            (rev 0)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php      2015-09-01 13:49:00 UTC (rev 33843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,76 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Text widget class
+ *
+ * @since 2.8.0
+ * @package WordPress
+ * @subpackage Widgets
+ */
+class WP_Widget_Text extends WP_Widget {
+
+       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);
+       }
+
+       /**
+        * @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 );
+
+               /**
+                * 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 $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 $args['after_widget'];
+       }
+
+       /**
+        * @param array $new_instance
+        * @param array $old_instance
+        * @return array
+        */
+       public function update( $new_instance, $old_instance ) {
+               $instance = $old_instance;
+               $instance['title'] = sanitize_text_field( $new_instance['title'] );
+               if ( current_user_can('unfiltered_html') )
+                       $instance['text'] =  $new_instance['text'];
+               else
+                       $instance['text'] = wp_kses_post( stripslashes( $new_instance['text'] ) );
+               $instance['filter'] = ! empty( $new_instance['filter'] );
+               return $instance;
+       }
+
+       /**
+        * @param array $instance
+        */
+       public function form( $instance ) {
+               $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) );
+               $filter = isset( $instance['filter'] ) ? $instance['filter'] : 0;
+               $title = sanitize_text_field( $instance['title'] );
+               ?>
+               <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><label for="<?php echo $this->get_field_id( 'text' ); ?>"><?php _e( 'Content:' ); ?></label>
+               <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 esc_textarea( $instance['text'] ); ?></textarea></p>
+
+               <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked( $filter ); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
+<?php
+       }
+}
</ins></span></pre>
</div>
</div>

</body>
</html>