Uploads: Fix the Order of Operations for wp_mkdir_p() which caused this branch to never be hit. Props fboender. Fixes #26781 for trunk. See #25822
Built from https://develop.svn.wordpress.org/trunk@26926 git-svn-id: http://core.svn.wordpress.org/trunk@26807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
dea41019ef
commit
2d9dd4979e
|
@ -1378,7 +1378,7 @@ function wp_mkdir_p( $target ) {
|
||||||
if ( @mkdir( $target, $dir_perms, true ) ) {
|
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 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() ) {
|
if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
|
||||||
$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
|
$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
|
||||||
for ( $i = 1; $i <= count( $folder_parts ); $i++ ) {
|
for ( $i = 1; $i <= count( $folder_parts ); $i++ ) {
|
||||||
@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
|
@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
|
||||||
|
|
Loading…
Reference in New Issue