Changeset 55669

Timestamp:

04/21/2023 03:11:46 AM (3 years ago)

Author:

azaozz

Message:

Script Loader: Improve code style and readability in _wp_normalize_relative_css_links().

Props: westonruter.
See: 58069.

Location:

trunk

Files:

• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/styles.php (modified) (1 diff)

trunk/src/wp-includes/script-loader.php

@@ -2945 +2945 @@
                         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;

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -197 +197 @@
          * @ticket 54243
          * @ticket 54922
+         * @ticket 58069
          *
          * @covers ::_wp_normalize_relative_css_links