Ticket #18650: 18650.3.patch

src/wp-includes/default-widgets.php

@@ -285 +285 @@
                 }
 
                 if ( $d ) {
+                        $label_for = $this->id_base . '-dropdown-' . $this->number;
+                        echo '<label class="screen-reader-text archives-label" for="' . esc_attr( $label_for ) . '">' . $title . '</label>';
+
 ?>
-                <select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
+                <select id="<?php echo esc_attr( $label_for ); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
                         <?php
                         /**
                          * Filter the arguments for the Archives widget drop-down.
@@ -563 +566 @@
         }
 
         public function widget( $args, $instance ) {
-
+        
                 /** 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 );
 
@@ -576 +579 @@
                         echo $args['before_title'] . $title . $args['after_title'];
                 }
 
-                $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
+                $cat_args = array(
+                        'orderby'      => 'name',
+                        'show_count'   => $c,
+                        'hierarchical' => $h
+                );
 
                 if ( $d ) {
-                        $cat_args['show_option_none'] = __('Select Category');
+                        static $first;
 
+                        $id = isset( $first ) ? 'cat' : $args['widget_id'] . '-select';
+                        $first = false;
+                        
+                        echo '<label class="screen-reader-text categories-label" for="' . esc_attr( $id ) . '">' . $title . '</label>';
+
+                        $cat_args['show_option_none'] = __( 'Select Category' );
+                        $cat_args['id'] = $id;
+
                         /**
                          * Filter the arguments for the Categories widget drop-down.
                          *
@@ -595 +610 @@
 
 <script type='text/javascript'>
 /* <![CDATA[ */
-        var dropdown = document.getElementById("cat");
+(function() {
+        var dropdown = document.getElementById("<?php echo esc_js( $id ); ?>");
         function onCatChange() {
                 if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
                         location.href = "<?php echo home_url(); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
@@ -602 +618 @@
                 }
         }
         dropdown.onchange = onCatChange;
+})();
 /* ]]> */
 </script>