Changeset 52699

Timestamp:

02/11/2022 12:12:56 PM (5 years ago)

Author:

gziolo

Message:

I18n: Standardize the script paths for blocks

When providing file paths to scripts (editorScript, script or viewScript), when there is a trailing ./ included then there was a different md5 generated for the file that didn't match the one used with the file generated in the translations folder.

Props Rahe.
See #54797.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (1 diff)
• tests/phpunit/tests/blocks/register.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -21 +21 @@
                 return $asset_handle_or_path;
         }
-        return substr(
+        $path = substr(
                 $asset_handle_or_path,
                 strlen( $path_prefix )
         );
+        if ( strpos( $path, './' ) === 0 ) {
+                $path = substr( $path, 2 );
+        }
+        return $path;
 }
 

trunk/tests/phpunit/tests/blocks/register.php

@@ -123 +123 @@
          */
         public function test_removes_block_asset_path_prefix() {
+                $result = remove_block_asset_path_prefix( 'file:block.js' );
+
+                $this->assertSame( 'block.js', $result );
+        }
+
+        /**
+         * @ticket 54797
+         */
+        public function test_removes_block_asset_path_prefix_and_current_directory() {
                 $result = remove_block_asset_path_prefix( 'file:./block.js' );
 
-                $this->assertSame( './block.js', $result );
+                $this->assertSame( 'block.js', $result );
         }