Changeset 52069 for trunk/src/wp-includes/block-supports/border.php

Timestamp:

11/09/2021 02:15:23 AM (3 years ago)

Author:

noisysocks

Message:

Add Site Editor and PHP changes from Gutenberg 10.1 - 11.9

• First pass at adding the site editor from the Gutenberg plugin to wp-admin/site-editor.php.
• Adds miscellaneous PHP changes from Gutenberg 10.1 - 11.9.

Follows [52042].
See #54337.
Props youknowriad, aristath, hellofromtonya, gziolo.

File:

• trunk/src/wp-includes/block-supports/border.php (modified) (2 diffs)

trunk/src/wp-includes/block-supports/border.php

@@ -64 +64 @@
         isset( $block_attributes['style']['border']['radius'] )
     ) {
-        $border_radius = (int) $block_attributes['style']['border']['radius'];
-        $styles[]      = sprintf( 'border-radius: %dpx;', $border_radius );
+        $border_radius = $block_attributes['style']['border']['radius'];
+
+        if ( is_array( $border_radius ) ) {
+            // We have individual border radius corner values.
+            foreach ( $border_radius as $key => $radius ) {
+                // Convert CamelCase corner name to kebab-case.
+                $corner   = strtolower( preg_replace( '/(?<!^)[A-Z]/', '-$0', $key ) );
+                $styles[] = sprintf( 'border-%s-radius: %s;', $corner, $radius );
+            }
+        } else {
+            // This check handles original unitless implementation.
+            if ( is_numeric( $border_radius ) ) {
+                $border_radius .= 'px';
+            }
+
+            $styles[] = sprintf( 'border-radius: %s;', $border_radius );
+        }
     }
 
@@ -82 +97 @@
         isset( $block_attributes['style']['border']['width'] )
     ) {
-        $border_width = intval( $block_attributes['style']['border']['width'] );
-        $styles[]     = sprintf( 'border-width: %dpx;', $border_width );
+        $border_width = $block_attributes['style']['border']['width'];
+
+        // This check handles original unitless implementation.
+        if ( is_numeric( $border_width ) ) {
+            $border_width .= 'px';
+        }
+
+        $styles[] = sprintf( 'border-width: %s;', $border_width );
     }