From 900a79dc53b462d402662983189549f9006a6c25 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Wed, 5 Jul 2023 07:16:21 +0000 Subject: [PATCH] Editor: Normalize paths in `register_core_block_style_handles()`. Previously, this function did not normalize paths before using `glob()` or registering styles. This led to a mixture of forward-slashes and back-slashes in Windows environments. This change uses `wp_normalize_path()` to ensure Windows compatibility. Props wildworks, costdev, kafleg, mukesh27. Fixes #58711. Built from https://develop.svn.wordpress.org/trunk@56136 git-svn-id: http://core.svn.wordpress.org/trunk@55648 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks/index.php | 6 +++--- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/blocks/index.php b/wp-includes/blocks/index.php index f9ffa411af..23cbc78d26 100644 --- a/wp-includes/blocks/index.php +++ b/wp-includes/blocks/index.php @@ -48,16 +48,16 @@ function register_core_block_style_handles() { $transient_name = 'wp_core_block_css_files'; $files = get_transient( $transient_name ); if ( ! $files ) { - $files = glob( __DIR__ . '/**/**.css' ); + $files = glob( wp_normalize_path( __DIR__ . '/**/**.css' ) ); set_transient( $transient_name, $files ); } } else { - $files = glob( __DIR__ . '/**/**.css' ); + $files = glob( wp_normalize_path( __DIR__ . '/**/**.css' ) ); } $register_style = static function( $name, $filename, $style_handle ) use ( $includes_path, $includes_url, $suffix, $wp_styles, $files ) { $style_path = "blocks/{$name}/{$filename}{$suffix}.css"; - $path = $includes_path . $style_path; + $path = wp_normalize_path( $includes_path . $style_path ); if ( ! in_array( $path, $files, true ) ) { $wp_styles->add( diff --git a/wp-includes/version.php b/wp-includes/version.php index 8d8d48ea82..787c77646f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-beta3-56135'; +$wp_version = '6.3-beta3-56136'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.