Ticket #11218: 11218.patch

wp-includes/functions.php

@@ -2105 +2105 @@
 
         // separate the filename into a name and extension
         $info = pathinfo($filename);
-        $ext = !empty($info['extension']) ? $info['extension'] : '';
-        $name = basename($filename, ".{$ext}");
+        $ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
+        $name = basename($filename, $ext);
 
         // edge case: if file is named '.ext', treat as an empty name
-        if( $name === ".$ext" )
+        if( $name === $ext )
                 $name = '';
 
         // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
@@ -2118 +2118 @@
         } else {
                 $number = '';
 
-                if ( !empty( $ext ) )
-                        $ext = ".$ext";
+                // change '.ext' to lower case
+                if ( $ext && strtolower($ext) != $ext ) {
+                        // make sure there's no file with the upper case extension or image sub-sizes may be overwritten
+                        while ( file_exists( $dir . "/$filename" ) ) {
+                                $filename = str_replace( "$number$ext", ++$number . $ext, $filename );
+                        }
 
+                        $ext = strtolower($ext);
+                        $filename = preg_replace( '|\.' . preg_quote($info['extension']) . '$|', $ext, $filename );
+                }
+
                 while ( file_exists( $dir . "/$filename" ) ) {
                         if ( '' == "$number$ext" )
                                 $filename = $filename . ++$number . $ext;