Changeset 38294 for trunk/src/wp-admin/includes/file.php

Timestamp:

08/20/2016 11:35:50 PM (8 years ago)

Author:

wonderboymusic

Message:

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

Props JaworskiMatt.
Fixes #37608.

File:

• trunk/src/wp-admin/includes/file.php (modified) (1 diff)

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

@@ -78 +78 @@
     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 ) ) {