From 7b3c904f378b178455f366923dfe0ea5ab1f6e8a Mon Sep 17 00:00:00 2001
From: isabel_brison <isabel_brison@git.wordpress.org>
Date: Wed, 15 Dec 2021 04:08:04 +0000
Subject: [PATCH] Fix deprecated usage of passing null to explode()

As of PHP 8.1, explode() does not permit null as its second argument. This results in warnings being spat out on every page because of a usage of this in wp-includes/block-supports/layout.php.

See #53635.
Props noisysocks.

Built from https://develop.svn.wordpress.org/trunk@52380


git-svn-id: http://core.svn.wordpress.org/trunk@51972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/block-supports/layout.php | 4 ++--
 wp-includes/version.php               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/block-supports/layout.php b/wp-includes/block-supports/layout.php
index a78aabce04..018a59a571 100644
--- a/wp-includes/block-supports/layout.php
+++ b/wp-includes/block-supports/layout.php
@@ -46,8 +46,8 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
 
 	$style = '';
 	if ( 'default' === $layout_type ) {
-		$content_size = isset( $layout['contentSize'] ) ? $layout['contentSize'] : null;
-		$wide_size    = isset( $layout['wideSize'] ) ? $layout['wideSize'] : null;
+		$content_size = isset( $layout['contentSize'] ) ? $layout['contentSize'] : '';
+		$wide_size    = isset( $layout['wideSize'] ) ? $layout['wideSize'] : '';
 
 		$all_max_width_value  = $content_size ? $content_size : $wide_size;
 		$wide_max_width_value = $wide_size ? $wide_size : $content_size;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2da361dec2..9b13eed5f0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-beta3-52379';
+$wp_version = '5.9-beta3-52380';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.