Changeset 27887 for branches/3.7

Timestamp:

04/01/2014 04:01:10 AM (10 years ago)

Author:

nacin

Message:

Fix a regression in wp_mkdir_p() where the $mode of the parent folder is not correctly applied to all created paths.

Merges [26449] and [26927] from 3.8.x to the 3.7 branch.

props dd32.
fixes #25822.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/functions.php (modified) (2 diffs)

branches/3.7/src/wp-includes/functions.php

@@ -1373 +1373 @@
 
     // Get the permission bits.
-    if ( $target_parent && '.' != $target_parent ) {
-        $stat = @stat( $target_parent );
+    $dir_perms = false;
+    if ( $stat = @stat( $target_parent ) ) {
         $dir_perms = $stat['mode'] & 0007777;
     } else {
@@ -1381 +1381 @@
 
     if ( @mkdir( $target, $dir_perms, true ) ) {
+
+        // If a umask is set that modifies $dir_perms, we'll have to re-set the $dir_perms correctly with chmod()
+        if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
+            $folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
+            for ( $i = 1; $i <= count( $folder_parts ); $i++ ) {
+                @chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
+            }
+        }
+
         return true;
     }