Ticket #37608: 37608.diff

src/wp-admin/includes/file.php

@@ -77 +77 @@
 function get_file_description( $file ) {
         global $wp_file_descriptions, $allowed_files;
 
-        $relative_pathinfo = pathinfo( $file );
+        $dirname = pathinfo( $file, PATHINFO_DIRNAME );
+
         $file_path = $allowed_files[ $file ];
-        if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
+        if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $dirname ) {
                 return $wp_file_descriptions[ basename( $file ) ];
         } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
                 $template_data = implode( '', file( $file_path ) );

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

@@ -761 +761 @@
                 $backup_sizes = array();
 
         // Generate new filename.
-        $path = get_attached_file($post_id);
-        $path_parts = pathinfo( $path );
-        $filename = $path_parts['filename'];
+        $path = get_attached_file( $post_id );
+
+        $basename = pathinfo( $path, PATHINFO_BASENAME );
+        $dirname = pathinfo( $path, PATHINFO_DIRNAME );
+        $ext = pathinfo( $path, PATHINFO_EXTENSION );
+        $filename = pathinfo( $path, PATHINFO_FILENAME );
         $suffix = time() . rand(100, 999);
 
         if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
-                isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+                isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $basename ) {
 
-                if ( 'thumbnail' == $target )
-                        $new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
-                else
+                if ( 'thumbnail' == $target ) {
+                        $new_path = "{$dirname}/{$filename}-temp.{$ext}";
+                } else {
                         $new_path = $path;
+                }
         } else {
-                while( true ) {
+                while ( true ) {
                         $filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
                         $filename .= "-e{$suffix}";
-                        $new_filename = "{$filename}.{$path_parts['extension']}";
-                        $new_path = "{$path_parts['dirname']}/$new_filename";
-                        if ( file_exists($new_path) )
+                        $new_filename = "{$filename}.{$ext}";
+                        $new_path = "{$dirname}/$new_filename";
+                        if ( file_exists($new_path) ) {
                                 $suffix++;
-                        else
+                        } else {
                                 break;
+                        }
                 }
         }
 
@@ -792 +797 @@
                 return $return;
         }
 
-        if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
+        if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
                 $tag = false;
-                if ( isset($backup_sizes['full-orig']) ) {
-                        if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
+                if ( isset( $backup_sizes['full-orig'] ) ) {
+                        if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
                                 $tag = "full-$suffix";
+                        }
                 } else {
                         $tag = 'full-orig';
                 }
 
-                if ( $tag )
-                        $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
-
+                if ( $tag ) {
+                        $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $basename );
+                }
                 $success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
                 $meta['file'] = _wp_relative_upload_path( $new_path );
@@ -834 +840 @@
         if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE && ! empty( $meta['sizes'] ) ) {
                 foreach ( $meta['sizes'] as $size ) {
                         if ( ! empty( $size['file'] ) && preg_match( '/-e[0-9]{13}-/', $size['file'] ) ) {
-                                $delete_file = path_join( $path_parts['dirname'], $size['file'] );
+                                $delete_file = path_join( $dirname, $size['file'] );
                                 wp_delete_file( $delete_file );
                         }
                 }

src/wp-admin/includes/media.php

@@ -284 +284 @@
         if ( isset($file['error']) )
                 return new WP_Error( 'upload_error', $file['error'] );
 
-        $name_parts = pathinfo($name);
-        $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
+        $basename = pathinfo( $name, PATHINFO_BASENAME );
 
         $url = $file['url'];
         $type = $file['type'];
         $file = $file['file'];
-        $title = $name;
+        $title = $basename;
         $content = '';
         $excerpt = '';
 

src/wp-includes/class-wp-image-editor.php

@@ -346 +346 @@
                 }
 
                 if ( $filename ) {
-                        $ext = '';
-                        $info = pathinfo( $filename );
-                        $dir  = $info['dirname'];
+                        $dir = pathinfo( $filename, PATHINFO_DIRNAME );
+                        $ext = pathinfo( $filename, PATHINFO_EXTENSION );
 
-                        if ( isset( $info['extension'] ) )
-                                $ext = $info['extension'];
-
                         $filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
                 }
 
@@ -375 +371 @@
                 if ( ! $suffix )
                         $suffix = $this->get_suffix();
 
-                $info = pathinfo( $this->file );
-                $dir  = $info['dirname'];
-                $ext  = $info['extension'];
+                $dir  = pathinfo( $this->file, PATHINFO_DIRNAME );
+                $ext  = pathinfo( $this->file, PATHINFO_EXTENSION );
 
                 $name = wp_basename( $this->file, ".$ext" );
                 $new_ext = strtolower( $extension ? $extension : $ext );

src/wp-includes/functions.php

@@ -2034 +2034 @@
         $filename = sanitize_file_name($filename);
 
         // Separate the filename into a name and extension.
-        $info = pathinfo($filename);
-        $ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
-        $name = basename($filename, $ext);
+        $ext = pathinfo( $filename, PATHINFO_EXTENSION );
+        $name = pathinfo( $filename, PATHINFO_BASENAME );
+        if ( $ext ) {
+                $ext = '.' . $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.