Changeset 38294 for trunk/src/wp-includes/functions.php

Timestamp:

08/20/2016 11:35:50 PM (4 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-includes/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -2035 +2035 @@
 
     // 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 = '';
+    }
 
     /*