Changeset 25047

Timestamp:

08/17/2013 03:08:50 AM (13 years ago)

Author:

dd32

Message:

Make use of the recursive option in mkdir() in wp_mkdir_p(). Avoids a bunch of silenced PHP Notices being logged. Fixes #23196

File:

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

trunk/src/wp-includes/functions.php

@@ -1337 +1337 @@
                 return @is_dir( $target );
 
-        // Attempting to create the directory may clutter up our display.
-        if ( @mkdir( $target ) ) {
-                $stat = @stat( dirname( $target ) );
-                $dir_perms = $stat['mode'] & 0007777;  // Get the permission bits.
-                @chmod( $target, $dir_perms );
+        // We need to find the permissions of the parent folder that exists and inherit that.
+        $target_parent = dirname( $target );
+        while ( '.' != $target_parent && ! is_dir( $target_parent ) ) {
+                $target_parent = dirname( $target_parent );
+        }
+
+        // Get the permission bits.
+        if ( $target_parent && '.' != $target_parent ) {
+                $stat = @stat( $target_parent );
+                $dir_perms = $stat['mode'] & 0007777;
+        } else {
+                $dir_perms = 0777;
+        }
+
+        if ( @mkdir( $target, $dir_perms, true ) ) {
                 return true;
-        } elseif ( is_dir( dirname( $target ) ) ) {
-                        return false;
-        }
-
-        // If the above failed, attempt to create the parent node, then try again.
-        if ( ( $target != '/' ) && ( wp_mkdir_p( dirname( $target ) ) ) )
-                return wp_mkdir_p( $target );
+        }
 
         return false;