Changeset 44785 for trunk/src/wp-admin/includes/image.php

Timestamp:

03/01/2019 08:57:26 PM (7 years ago)

Author:

jorbin

Message:

Replace usages of basename() with wp_basename() in order to support multibyte filenames

This is focused on the pieces of code that touch media files and the tests that support them. basename isn't multibyte compatible out of the box. See ​http://php.net/basename and ​https://bugs.php.net/bug.php?id=62119.

See #43170.
Props Viper007Bond.

File:

• trunk/src/wp-admin/includes/image.php (modified) (4 diffs)

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

@@ -48 +48 @@
 
     if ( ! $dst_file ) {
-        $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+        $dst_file = str_replace( wp_basename( $src_file ), 'cropped-' . wp_basename( $src_file ), $src_file );
     }
 
@@ -57 +57 @@
     wp_mkdir_p( dirname( $dst_file ) );
 
-    $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+    $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), wp_basename( $dst_file ) );
 
     $result = $editor->save( $dst_file );
@@ -190 +190 @@
                     break;
             }
-            $basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
+            $basename = str_replace( '.', '-', wp_basename( $file ) ) . '-image' . $ext;
             $uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
             if ( false === $uploaded['error'] ) {
@@ -712 +712 @@
 
     if ( $src_file ) {
-        $dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
-        $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+        $dst_file = str_replace( wp_basename( $dst_file ), 'copy-' . wp_basename( $dst_file ), $dst_file );
+        $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), wp_basename( $dst_file ) );
 
         /*