Ticket #23196: 23196.diff

wp-includes/functions.php

@@ -1316 +1316 @@
         $wrapper = null;
 
         // strip the protocol
-        if( wp_is_stream( $target ) ) {
+        if ( wp_is_stream( $target ) ) {
                 list( $wrapper, $target ) = explode( '://', $target, 2 );
         }
 
@@ -1324 +1324 @@
         $target = str_replace( '//', '/', $target );
 
         // put the wrapper back on the target
-        if( $wrapper !== null ) {
+        if ( $wrapper !== null ) {
                 $target = $wrapper . '://' . $target;
         }
 
@@ -1336 +1336 @@
         if ( file_exists( $target ) )
                 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 = 0700;
+        }
+
+        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;
 }