From 498040b809ebe926d97d43618e6562e636c47f61 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Thu, 29 Sep 2016 01:21:31 +0000 Subject: [PATCH] Media: Use `wp_basename()` to create attachment titles from filenames. In [38294], `pathinfo()` was used with the `PATHINFO_BASENAME` constant to get the basename of the file to be used as an attachment title, which depends on PHP locale and can cause issues with UTF-8 characters. This uses `wp_basename()` instead, which is a more i18n-friendly version of `basename()`. Props SergeyBiryukov. Fixes #37608, #37989. Built from https://develop.svn.wordpress.org/trunk@38673 git-svn-id: http://core.svn.wordpress.org/trunk@38616 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/media.php | 4 +++- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 9d63694031..a5d81d9a44 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -283,7 +283,9 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override if ( isset($file['error']) ) return new WP_Error( 'upload_error', $file['error'] ); - $name = pathinfo( $_FILES[$file_id]['name'], PATHINFO_FILENAME ); + $name = $_FILES[$file_id]['name']; + $ext = pathinfo( $name, PATHINFO_EXTENSION ); + $name = wp_basename( $name, ".$ext" ); $url = $file['url']; $type = $file['type']; diff --git a/wp-includes/version.php b/wp-includes/version.php index 3ed191d96b..8fb76ce701 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38672'; +$wp_version = '4.7-alpha-38673'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.