Changeset 37421

Timestamp:

05/12/2016 12:39:49 PM (10 years ago)

Author:

ocean90

Message:

Filesystem API: Don't add '.' to the list of directories which need to be checked/created when extracting a file.

Prevents a PHP warning by WP_Filesystem_Direct::mkdir() when installing a language pack which doesn't have subdirectories.

Props tfrommen.
Fixes #36570.

File:

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

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

@@ -644 +644 @@
                 $uncompressed_size += $info['size'];
 
-                if ( '/' == substr($info['name'], -1) ) // directory
-                        $needed_dirs[] = $to . untrailingslashit($info['name']);
-                else
-                        $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+                if ( '/' === substr( $info['name'], -1 ) ) {
+                        // Directory.
+                        $needed_dirs[] = $to . untrailingslashit( $info['name'] );
+                } elseif ( '.' !== $dirname = dirname( $info['name'] ) ) {
+                        // Path to a file.
+                        $needed_dirs[] = $to . untrailingslashit( $dirname );
+                }
         }