Skip to content

Commit d447146

Browse files
Merge remote-tracking branch 'WordPress/trunk' into 63884-multisite-phpunit-logging
2 parents a8f0920 + 3d736c7 commit d447146

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/wp-includes/class-wp-block.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ private function process_block_bindings() {
297297
$block_type = $this->name;
298298
$parsed_block = $this->parsed_block;
299299
$computed_attributes = array();
300-
301300
$supported_block_attributes =
302301
self::BLOCK_BINDINGS_SUPPORTED_ATTRIBUTES[ $block_type ] ??
303302
array();

src/wp-includes/class-wp-customize-control.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ protected function render_content() {
566566
<?php
567567
break;
568568
case 'textarea':
569-
if ( !array_key_exists( 'rows', $this->input_attrs ) ) {
569+
if ( ! array_key_exists( 'rows', $this->input_attrs ) ) {
570570
$this->input_attrs['rows'] = 5;
571571
}
572572
?>

0 commit comments

Comments
 (0)