Changeset 10050

Timestamp:

12/04/2008 09:58:46 PM (16 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-admin/includes

Files:

• file.php (modified) (5 diffs)
• update-core.php (modified) (1 diff)
• update.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -499 +499 @@
             for ( $i = $i + 1; $i <= count($path); $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);
             }
@@ -517 +517 @@
                 for ( $i = $i + 1; $i <= count($path); $i++ ) { //< count() no file component please.
                     $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);
                 }
@@ -528 +528 @@
             if ( !$fs->put_contents( $to . $file['filename'], $file['content']) )
                 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);
         }
     }
@@ -559 +559 @@
                     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'] ) {
             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);
             }
@@ -604 +604 @@
     if ( !$wp_filesystem->connect() )
         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;

trunk/wp-admin/includes/update-core.php

@@ -228 +228 @@
     $maintenance_file = $to . '.maintenance';
     $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.

trunk/wp-admin/includes/update.php

@@ -469 +469 @@
         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');