golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Proper permissions for newly created files. Props azaozz. fixes #10170 for trunk 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11667 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-06-29 20:23:04 +00:00
parent 665989f969
commit 6f53717be4
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-admin/includes/class-wp-filesystem-direct.php
View File

@ -20,7 +20,6 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
function WP_Filesystem_Direct($arg) {
$this->method = 'direct';
$this->errors = new WP_Error();
$this->permission = umask();
}
function connect() {
return true;
@ -64,12 +63,22 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
return true;
}
function chmod($file, $mode = false, $recursive = false) {
if ( ! $mode )
$mode = $this->permission;
if ( ! $this->exists($file) )
return false;
if ( ! $mode ) {
if ( $this->permission )
$mode = $this->permission;
elseif ( $this->is_file($file) )
$mode = FS_CHMOD_FILE;
elseif ( $this->is_dir($file) )
$mode = FS_CHMOD_DIR;
else
return false;
}
if ( ! $recursive )
return @chmod($file,$mode);
return @chmod($file, $mode);
if ( ! $this->is_dir($file) )
return @chmod($file, $mode);
//Is a directory, and we want recursive
@ -197,11 +206,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
}
function mkdir($path, $chmod = false, $chown = false, $chgrp = false){
if ( ! $chmod)
$chmod = $this->permission;
if ( ! @mkdir($path, $chmod) )
if ( ! @mkdir($path) )
return false;
$this->chmod($path, $chmod);
if ( $chown )
$this->chown($path, $chown);
if ( $chgrp )