Ticket #18650: 18650.diff

wp-includes/default-widgets.php

@@ -244 +244 @@
                 $title = apply_filters('widget_title', empty($instance['title']) ? __('Archives') : $instance['title'], $instance, $this->id_base);
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( $title ) {
+                        echo $before_title;
+                        if ( $d ) {
+                                echo '<label for="' . $this->id_base . '-dropdown-' . $this->number . '">' . $title . '</label>';
+                        } else {
+                                echo $title;
+                        }
+                        echo $after_title;
+                }
 
                 if ( $d ) {
 ?>
-                <select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'> <option value=""><?php echo esc_attr(__('Select Month')); ?></option> <?php wp_get_archives(apply_filters('widget_archives_dropdown_args', array('type' => 'monthly', 'format' => 'option', 'show_post_count' => $c))); ?> </select>
+                <select id="<?php echo $this->id_base . '-dropdown-' . $this->number; ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
+                        <option value=""><?php esc_attr_e( 'Select Month' ); ?></option>
+                        <?php wp_get_archives( apply_filters( 'widget_archives_dropdown_args', array( 'type' => 'monthly', 'format' => 'option', 'show_post_count' => $c ) ) ); ?>
+                </select>
 <?php
                 } else {
 ?>
@@ -313 +323 @@
                         <ul>
                         <?php wp_register(); ?>
                         <li><?php wp_loginout(); ?></li>
-                        <li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php echo esc_attr(__('Syndicate this site using RSS 2.0')); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-                        <li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php echo esc_attr(__('The latest comments to all posts in RSS')); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+                        <li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php esc_attr_e( 'Syndicate this site using RSS 2.0' ); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+                        <li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php esc_attr_e( 'The latest comments to all posts in RSS' ); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
                         <?php echo apply_filters( 'widget_meta_poweredby', sprintf( '<li><a href="%s" title="%s">%s</a></li>',
                                 esc_url( __( 'https://wordpress.org/' ) ),
                                 esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ),
@@ -448 +458 @@
         function widget( $args, $instance ) {
                 extract( $args );
 
+                static $first;
+                $id = isset( $first ) ? 'cat' : $widget_id . '-select';
+                $first = false;
+
                 $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';
@@ -454 +468 @@
                 $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
 
                 echo $before_widget;
-                if ( $title )
-                        echo $before_title . $title . $after_title;
+                if ( $title ) {
+                        echo $before_title;
+                        if ( $d ) {
+                                echo '<label for="' . $id . '">' . $title . '</label>';
+                        } else {
+                                echo $title;
+                        }
+                        echo $after_title;
+                }
 
                 $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
 
                 if ( $d ) {
                         $cat_args['show_option_none'] = __('Select Category');
+                        $cat_args['id'] = $id;
                         wp_dropdown_categories(apply_filters('widget_categories_dropdown_args', $cat_args));
 ?>
 
 <script type='text/javascript'>
 /* <![CDATA[ */
-        var dropdown = document.getElementById("cat");
+(function() {
+        var dropdown = document.getElementById("<?php echo $id; ?>");
         function onCatChange() {
                 if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
                         location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
@@ -473 +496 @@
                 }
         }
         dropdown.onchange = onCatChange;
+})();
 /* ]]> */
 </script>