Changeset 29290

Timestamp:

07/24/2014 10:08:09 PM (10 years ago)

Author:

wonderboymusic

Message:

In sanitize_file_name(), replace %20 and + with dashes. Remove unnecessary code from _wp_handle_upload().

Adds unit tests.

Props ericmann.
Fixes #16330.

Location:

trunk

Files:

• src/wp-admin/includes/file.php (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/SanitizeFileName.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -328 +328 @@
 
     $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
-    // Strip the query strings.
-    $filename = str_replace( '?', '-', $filename );
-    $filename = str_replace( '&', '-', $filename );
 
     // Move the file to the uploads dir.

trunk/src/wp-includes/formatting.php

@@ -1050 +1050 @@
     $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
     $filename = str_replace($special_chars, '', $filename);
+    $filename = str_replace( array( '%20', '+' ), '-', $filename );
     $filename = preg_replace('/[\s-]+/', '-', $filename);
     $filename = trim($filename, '.-_');

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

@@ -20 +20 @@
     }
 
+    /**
+     * Test that spaces are correctly replaced with dashes.
+     *
+     * @ticket 16330
+     */
+    function test_replace_spaces() {
+        $urls = array(
+            'unencoded space.png'   => 'unencoded-space.png',
+            'encoded%20space.jpg'   => 'encoded-space.jpg',
+            'plus+space.jpg'        => 'plus-space.jpg',
+            'multi %20 +space.png'   => 'multi-space.png',
+        );
+
+        foreach( $urls as $test => $expected ) {
+            $this->assertEquals( $expected, sanitize_file_name( $test ) );
+        }
+    }
+
     function test_replaces_any_number_of_hyphens_with_one_hyphen() {
         $this->assertEquals("a-t-t", sanitize_file_name("a----t----t"));