Changeset 50933

Timestamp:

05/19/2021 06:38:53 PM (4 years ago)

Author:

davidbaumwald

Message:

Twenty Twenty: Correct label attribute references to aria_label in get_search_form.

In the bundled Twenty Twenty theme, a label argument was passed to get_search_form but used as the aria_label on the form. This change updates the argument name to aria_label and maintains backwards compatibility for usage of the original label argument.

Props poena, sabernhardt, ipulc2, kishanjasani, mukesh27.
Fixes #51877.

Location:

trunk/src/wp-content/themes/twentytwenty

Files:

• 404.php (modified) (1 diff)
• index.php (modified) (1 diff)
• searchform.php (modified) (1 diff)
• template-parts/modal-search.php (modified) (1 diff)

trunk/src/wp-content/themes/twentytwenty/404.php

@@ -22 +22 @@
         get_search_form(
             array(
-                'label' => __( '404 not found', 'twentytwenty' ),
+                'aria_label' => __( '404 not found', 'twentytwenty' ),
             )
         );

trunk/src/wp-content/themes/twentytwenty/index.php

@@ -99 +99 @@
             get_search_form(
                 array(
-                    'label' => __( 'search again', 'twentytwenty' ),
+                    'aria_label' => __( 'search again', 'twentytwenty' ),
                 )
             );

trunk/src/wp-content/themes/twentytwenty/searchform.php

@@ -18 +18 @@
 $twentytwenty_unique_id = twentytwenty_unique_id( 'search-form-' );
 
-$twentytwenty_aria_label = ! empty( $args['label'] ) ? 'aria-label="' . esc_attr( $args['label'] ) . '"' : '';
+$twentytwenty_aria_label = ! empty( $args['aria_label'] ) ? 'aria-label="' . esc_attr( $args['aria_label'] ) . '"' : '';
+// Backward compatibility, in case a child theme template uses a `label` argument.
+if ( empty( $twentytwenty_aria_label ) && ! empty( $args['label'] ) ) {
+    $twentytwenty_aria_label = 'aria-label="' . esc_attr( $args['label'] ) . '"';
+}
 ?>
 <form role="search" <?php echo $twentytwenty_aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">

trunk/src/wp-content/themes/twentytwenty/template-parts/modal-search.php

@@ -18 +18 @@
             get_search_form(
                 array(
-                    'label' => __( 'Search for:', 'twentytwenty' ),
+                    'aria_label' => __( 'Search for:', 'twentytwenty' ),
                 )
             );