IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Media: when calling pathinfo(), also pass a PATHINFO_* constant to avoid array notices for unset keys.

Browse Source 
Props JaworskiMatt.
Fixes #37608.

Built from https://develop.svn.wordpress.org/trunk@38294


git-svn-id: http://core.svn.wordpress.org/trunk@38235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
2016-08-20 23:36:28 +00:00
parent d73964aab6
commit 7ac88c02fa
6 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/file.php
View File

@@ -77,9 +77,10 @@ $wp_file_descriptions = array(
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 ) );