WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow override of default file permissions with FS_CHMOD_DIR and FS_CHMOD_FILE. Props DD32. see #8478 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-12-04 21:58:46 +00:00
parent 0927fbcc0d
commit 535db0f29a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/includes/file.php
View File

@ -498,7 +498,7 @@ function unzip_file($file, $to) {
if ( $fs->is_dir($tmppath) ) { //Found the highest folder that exists, Create from here(ie +1) if ( $fs->is_dir($tmppath) ) { //Found the highest folder that exists, Create from here(ie +1)
for ( $i = $i + 1; $i <= count($path); $i++ ) { for ( $i = $i + 1; $i <= count($path); $i++ ) {
$tmppath = implode('/', array_slice($path, 0, $i) ); $tmppath = implode('/', array_slice($path, 0, $i) );
if ( ! $fs->mkdir($tmppath, 0755) ) if ( ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath); return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
} }
break; //Exit main for loop break; //Exit main for loop
@ -516,7 +516,7 @@ function unzip_file($file, $to) {
if ( $fs->is_dir($tmppath) ) {//Found the highest folder that exists, Create from here if ( $fs->is_dir($tmppath) ) {//Found the highest folder that exists, Create from here
for ( $i = $i + 1; $i <= count($path); $i++ ) { //< count() no file component please. for ( $i = $i + 1; $i <= count($path); $i++ ) { //< count() no file component please.
$tmppath = $to . implode('/', array_slice($path, 0, $i) ); $tmppath = $to . implode('/', array_slice($path, 0, $i) );
if ( ! $fs->is_dir($tmppath) && ! $fs->mkdir($tmppath, 0755) ) if ( ! $fs->is_dir($tmppath) && ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath); return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
} }
break; //Exit main for loop break; //Exit main for loop
@ -527,7 +527,7 @@ function unzip_file($file, $to) {
if ( ! $file['folder'] ) { if ( ! $file['folder'] ) {
if ( !$fs->put_contents( $to . $file['filename'], $file['content']) ) if ( !$fs->put_contents( $to . $file['filename'], $file['content']) )
return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']); return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']);
$fs->chmod($to . $file['filename'], 0644); $fs->chmod($to . $file['filename'], FS_CHMOD_FILE);
} }
} }
return true; return true;
@ -558,10 +558,10 @@ function copy_dir($from, $to) {
if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename); return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename);
} }
$wp_filesystem->chmod($to . $filename, 0644); $wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE);
} elseif ( 'd' == $fileinfo['type'] ) { } elseif ( 'd' == $fileinfo['type'] ) {
if ( !$wp_filesystem->is_dir($to . $filename) ) { if ( !$wp_filesystem->is_dir($to . $filename) ) {
if ( !$wp_filesystem->mkdir($to . $filename, 0755) ) if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename); return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename);
} }
$result = copy_dir($from . $filename, $to . $filename); $result = copy_dir($from . $filename, $to . $filename);
@ -604,6 +604,12 @@ function WP_Filesystem( $args = false ) {
if ( !$wp_filesystem->connect() ) if ( !$wp_filesystem->connect() )
return false; //There was an erorr connecting to the server. return false; //There was an erorr connecting to the server.
// Set the permission constants if not already set.
if ( ! defined('FS_CHMOD_DIR') )
define('FS_CHMOD_DIR', 0755 );
if ( ! defined('FS_CHMOD_FILE') )
define('FS_CHMOD_FILE', 0644 );
return true; return true;
} }

2
wp-admin/includes/update-core.php
View File

@ -227,7 +227,7 @@ function update_core($from, $to) {
$maintenance_string = '<?php $upgrading = ' . time() . '; ?>'; $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
$maintenance_file = $to . '.maintenance'; $maintenance_file = $to . '.maintenance';
$wp_filesystem->delete($maintenance_file); $wp_filesystem->delete($maintenance_file);
$wp_filesystem->put_contents($maintenance_file, $maintenance_string, 0644); $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
// Copy new versions of WP files into place. // Copy new versions of WP files into place.
$result = copy_dir($from . '/wordpress', $to); $result = copy_dir($from . '/wordpress', $to);

2
wp-admin/includes/update.php
View File

@ -468,7 +468,7 @@ function wp_update_core($current, $feedback = '') {
$wp_filesystem->delete($working_dir, true); $wp_filesystem->delete($working_dir, true);
return new WP_Error('copy_failed', __('Could not copy files')); return new WP_Error('copy_failed', __('Could not copy files'));
} }
$wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', 0644); $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
require(ABSPATH . 'wp-admin/includes/update-core.php'); require(ABSPATH . 'wp-admin/includes/update-core.php');