Changeset 17525 for trunk/wp-admin/includes/file.php

Timestamp:

03/22/2011 12:04:15 AM (14 years ago)

Author:

dd32

Message:

Optimisations to WP_Filesystem; Pass known information to called functions. Props aldenta (John Ford) for investigation and patch. See #10913

File:

• trunk/wp-admin/includes/file.php (modified) (2 diffs)

trunk/wp-admin/includes/file.php

@@ -81 +81 @@
     $siteurl = get_option( 'siteurl' );
     if ( $home != '' && $home != $siteurl ) {
-            $wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */
-            $pos = strpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
-            $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);
+        $wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */
+        $pos = strpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home);
+        $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);
         $home_path = trailingslashit( $home_path );
     } else {
@@ -774 +774 @@
     foreach ( (array) $dirlist as $filename => $fileinfo ) {
         if ( 'f' == $fileinfo['type'] ) {
-            if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) {
+            if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
                 // If copy failed, chmod file to 0644 and try again.
                 $wp_filesystem->chmod($to . $filename, 0644);
-                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
+                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
                     return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename);
             }
-            $wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE);
         } elseif ( 'd' == $fileinfo['type'] ) {
             if ( !$wp_filesystem->is_dir($to . $filename) ) {