From b1a6d31cfe1cc763cd6c3534d179ce3e7cdc6e06 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 21 Apr 2023 03:13:22 +0000 Subject: [PATCH] Script Loader: Improve code style and readability in `_wp_normalize_relative_css_links()`. Props: westonruter. See: 58069. Built from https://develop.svn.wordpress.org/trunk@55669 git-svn-id: http://core.svn.wordpress.org/trunk@55181 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/script-loader.php | 31 +++++++++++++++---------------- wp-includes/version.php | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 9423145a77..f48e8debeb 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -2944,25 +2944,24 @@ function _wp_normalize_relative_css_links( $css, $stylesheet_url ) { static function ( $matches ) use ( $stylesheet_url ) { list( , $prefix, $url ) = $matches; - if ( ! ( - str_starts_with( $url, 'http:' ) - || - str_starts_with( $url, 'https:' ) - || - str_starts_with( $url, '//' ) - || - str_starts_with( $url, '#' ) - || + // Short-circuit if the URL does not require normalization. + if ( + str_starts_with( $url, 'http:' ) || + str_starts_with( $url, 'https:' ) || + str_starts_with( $url, '//' ) || + str_starts_with( $url, '#' ) || str_starts_with( $url, 'data:' ) - ) ) { - // Build the absolute URL. - $absolute_url = dirname( $stylesheet_url ) . '/' . $url; - $absolute_url = str_replace( '/./', '/', $absolute_url ); - - // Convert to URL related to the site root. - $url = wp_make_link_relative( $absolute_url ); + ) { + return $matches[0]; } + // Build the absolute URL. + $absolute_url = dirname( $stylesheet_url ) . '/' . $url; + $absolute_url = str_replace( '/./', '/', $absolute_url ); + + // Convert to URL related to the site root. + $url = wp_make_link_relative( $absolute_url ); + return $prefix . $url; }, $css diff --git a/wp-includes/version.php b/wp-includes/version.php index 590ff7a391..f716b5ada3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55667'; +$wp_version = '6.3-alpha-55669'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.