Ticket #50855: 50855.2.diff

src/wp-includes/formatting.php

@@ -2017 +2017 @@
          */
         $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 = str_replace( $special_chars, '', $filename );
         $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
         $filename = trim( $filename, '.-_' );
 

tests/phpunit/tests/formatting/SanitizeFileName.php

@@ -17 +17 @@
                         $string .= $char;
                 }
                 $string .= 'test';
-                $this->assertSame( 'testtest', sanitize_file_name( $string ) );
+                $this->assertSame( 'test-test', sanitize_file_name( $string ) );
         }
 
         /**
@@ -38 +38 @@
                 $urls = array(
                         'unencoded space.png'  => 'unencoded-space.png',
                         'encoded-space.jpg'    => 'encoded-space.jpg',
-                        'plus+space.jpg'       => 'plusspace.jpg',
-                        'multi %20 +space.png' => 'multi-20-space.png',
+                        'plus+space.jpg'       => 'plus-space.jpg',
+                        'multi %20 +space.png' => 'multi-space.png',
                 );
 
                 foreach ( $urls as $test => $expected ) {