Ticket #18650: 18650.2.patch

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 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>
 <?php
                 } else {
 ?>
                 <ul>
-                <?php wp_get_archives(apply_filters('widget_archives_args', array('type' => 'monthly', 'show_post_count' => $c))); ?>
+                        <?php wp_get_archives( apply_filters( 'widget_archives_args', array( 'type' => 'monthly', 'show_post_count' => $c ) ) ); ?>
                 </ul>
 <?php
                 }
@@ -454 +463 @@
                 $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="' . $this->id_base . '-dropdown-' . $this->number . '">' . $title . '</label>';
+                        else
+                                echo $title;
+                        echo $after_title;
+                }
 
-                $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
+                $cat_args = array( 'orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h );
 
                 if ( $d ) {
                         $cat_args['show_option_none'] = __('Select Category');
-                        wp_dropdown_categories(apply_filters('widget_categories_dropdown_args', $cat_args));
+                        $cat_args['id'] = $this->id_base . '-dropdown-' . $this->number;
+                        wp_dropdown_categories( apply_filters( 'widget_categories_dropdown_args', $cat_args ) );
 ?>
 
 <script type='text/javascript'>
 /* <![CDATA[ */
-        var dropdown = document.getElementById("cat");
+        var dropdown = document.getElementById("<?php echo $this->id_base . '-dropdown-' . $this->number; ?>");
         function onCatChange() {
                 if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
                         location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;