Changeset 48603

Timestamp:

07/24/2020 06:01:48 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Media: Remove accents in sanitize_file_name().

This brings some consistency with sanitize_title() and sanitize_user().

Props tar.gz, NumidWasNotAvailable, juliobox, p_enrique, cristovaov, zodiac1978, mikeschroder, markoheijnen, chriscct7, swissspidy, DrProtocols, pento, gitlost, joemcgill, dustinbolton, programmin, Vayu, MaximeCulea, lucasbustamante, nilovelez, RavanH, audrasjb, SergeyBiryukov.
See #22363.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (3 diffs)
• tests/phpunit/tests/formatting/SanitizeFileName.php (modified) (3 diffs)

trunk/src/wp-includes/formatting.php

@@ -1985 +1985 @@
  */
 function sanitize_file_name( $filename ) {
-    $filename_raw  = $filename;
+    $filename_raw = $filename;
+    $filename     = remove_accents( $filename );
+
     $special_chars = array( '?', '[', ']', '/', '\\', '=', '<', '>', ':', ';', ',', "'", '"', '&', '$', '#', '*', '(', ')', '|', '~', '`', '!', '{', '}', '%', '+', '’', '«', '»', '”', '“', chr( 0 ) );
 
@@ -2014 +2016 @@
      */
     $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
-    $filename      = str_replace( $special_chars, '', $filename );
-    $filename      = str_replace( array( '%20', '+' ), '-', $filename );
-    $filename      = preg_replace( '/[\r\n\t -]+/', '-', $filename );
-    $filename      = trim( $filename, '.-_' );
+
+    $filename = str_replace( $special_chars, '', $filename );
+    $filename = str_replace( array( '%20', '+' ), '-', $filename );
+    $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
+    $filename = trim( $filename, '.-_' );
 
     if ( false === strpos( $filename, '.' ) ) {
@@ -2069 +2072 @@
         }
     }
+
     $filename .= '.' . $extension;
+
     /** This filter is documented in wp-includes/formatting.php */
     return apply_filters( 'sanitize_file_name', $filename, $filename_raw );

trunk/tests/phpunit/tests/formatting/SanitizeFileName.php

@@ -22 +22 @@
 
     /**
+     * @ticket 22363
+     */
+    function test_removes_accents() {
+        $in  = 'àáâãäåæçèéêëìíîïñòóôõöøùúûüýÿ';
+        $out = 'aaaaaaaeceeeeiiiinoooooouuuuyy';
+        $this->assertEquals( $out, sanitize_file_name( $in ) );
+    }
+
+    /**
      * Test that spaces are correctly replaced with dashes.
      *
      * @ticket 16330
      */
-    function test_replace_spaces() {
+    function test_replaces_spaces() {
         $urls = array(
             'unencoded space.png'  => 'unencoded-space.png',
@@ -59 +68 @@
     }
 
-    function test_replaces_unnammed_file_extensions() {
+    function test_replaces_unnamed_file_extensions() {
         // Test filenames with both supported and unsupported extensions.
         $this->assertEquals( 'unnamed-file.exe', sanitize_file_name( '_.exe' ) );
@@ -65 +74 @@
     }
 
-    function test_replaces_unnammed_file_extensionless() {
+    function test_replaces_unnamed_file_extensionless() {
         // Test a filenames that becomes extensionless.
         $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) );