Changeset 35122

Timestamp:

10/13/2015 03:21:13 AM (9 years ago)

Author:

wonderboymusic

Message:

Fotmatting: in sanitize_file_name(), escape % when uploads contain them, otherwise attachment URLs will unescape the char and break.

Adds unit tests.

Props mordauk, simonwheatley, dd32, solarissmoke.
Fixes #16226.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -1369 +1369 @@
 function sanitize_file_name( $filename ) {
     $filename_raw = $filename;
-    $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0));
+    $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0));
     /**
      * Filter the list of characters to remove from a filename.

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

@@ -12 +12 @@
 
     function test_removes_special_chars() {
-        $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0));
+        $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0));
         $string = 'test';
         foreach ( $special_chars as $char )
@@ -27 +27 @@
     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',
+            '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',
         );
 
@@ -50 +50 @@
         $this->assertEquals("a-t", sanitize_file_name("a    \n\n\nt"));
     }
+
+    /**
+     * @ticket 16226
+     */
+    function test_replaces_percent_sign() {
+        $this->assertEquals( 'a22b.jpg', sanitize_file_name( 'a%22b.jpg' ) );
+    }
 }