Changeset 35276

Timestamp:

10/20/2015 04:04:26 AM (10 years ago)

Author:

wonderboymusic

Message:

Formatting: when making unique filenames in wp_unique_filename() by adding an incrementing number, prefix it with a dash to disambiguate from files that end in numbers.

Updates unit tests.

Props mikejolley, tyxla.
Fixes #21453.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -1919 +1919 @@
             while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) {
                 $new_number = $number + 1;
-                $filename = str_replace( "$number$ext", "$new_number$ext", $filename );
-                $filename2 = str_replace( "$number$ext2", "$new_number$ext2", $filename2 );
+                $filename = str_replace( array( "-$number$ext", "$number$ext" ), "-$new_number$ext", $filename );
+                $filename2 = str_replace( array( "-$number$ext2", "$number$ext2" ), "-$new_number$ext2", $filename2 );
                 $number = $new_number;
             }
@@ -1927 +1927 @@
 
         while ( file_exists( $dir . "/$filename" ) ) {
-            if ( '' == "$number$ext" )
-                $filename = $filename . ++$number . $ext;
-            else
-                $filename = str_replace( "$number$ext", ++$number . $ext, $filename );
+            if ( '' == "$number$ext" ) {
+                $filename = "$filename-" . ++$number;
+            } else {
+                $filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . ++$number . $ext, $filename );
+            }
         }
     }

trunk/tests/phpunit/tests/functions.php

@@ -147 +147 @@
         // check number is appended for file already exists
         $this->assertFileExists( $testdir . 'test-image.png', 'Test image does not exist' );
-        $this->assertEquals( 'test-image1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );
-        $this->assertFileNotExists( $testdir . 'test-image1.png' );
+        $this->assertEquals( 'test-image-1.png', wp_unique_filename( $testdir, 'test-image.png' ), 'Number not appended correctly' );
+        $this->assertFileNotExists( $testdir . 'test-image-1.png' );
 
         // check special chars