Changeset 49226 for trunk/src/wp-includes/blocks/search.php

Timestamp:

10/20/2020 01:33:02 PM (4 years ago)

Author:

youknowriad

Message:

Block Editor: Update the WordPress Packages to the latest version.

This includes the packages that match the Gutenberg 9.2 Release.
It is going to be the last block-editor features update for WordPress 5.6.
It also updates the block-supports code base to the latest APIs.

Props isabel_brison, noisysocks, desrosj.
Fixes #51570.

File:

• trunk/src/wp-includes/blocks/search.php (modified) (4 diffs)

trunk/src/wp-includes/blocks/search.php

@@ -66 +66 @@
     if ( $show_button ) {
         $button_internal_markup = '';
+        $button_classes         = '';
 
         if ( ! $use_icon_button ) {
@@ -72 +73 @@
             }
         } else {
+            $button_classes        .= 'has-icon';
             $button_internal_markup =
-                '<svg id="search-icon" class="search-icon" viewBox="0 0 24 24">
+                '<svg id="search-icon" class="search-icon" viewBox="0 0 24 24" width="24" height="24">
                     <path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path>
                 </svg>';
@@ -79 +81 @@
 
         $button_markup = sprintf(
-            '<button type="submit" class="wp-block-search__button">%s</button>',
+            '<button type="submit"class="wp-block-search__button ' . $button_classes . '">%s</button>',
             $button_internal_markup
         );
@@ -90 +92 @@
     }
 
-    $field_markup = sprintf(
+    $field_markup       = sprintf(
         '<div class="wp-block-search__inside-wrapper"%s>%s</div>',
         $width_styles,
         $input_markup . $button_markup
     );
+    $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
 
     return sprintf(
-        '<form role="search" method="get" action="%s" class="%s">%s</form>',
+        '<form role="search" method="get" action="%s" %s>%s</form>',
         esc_url( home_url( '/' ) ),
-        $classnames,
+        $wrapper_attributes,
         $label_markup . $field_markup
     );