Changeset 38470 for trunk/src/wp-admin/includes/file.php

Timestamp:

08/31/2016 04:30:48 PM (8 years ago)

Author:

wonderboymusic

Message:

Bootstrap: do not go gentle into that good night r38411, r38412, and parts of r38389.

See #36335.

File:

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

trunk/src/wp-admin/includes/file.php

@@ -738 +738 @@
     mbstring_binary_safe_encoding();
 
+    require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+
     $archive = new PclZip($file);
 
@@ -885 +887 @@
     global $wp_filesystem;
 
+    require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
+
     $method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
 
@@ -890 +894 @@
         return false;
 
-    $map = array(
-        'base' => 'WP_Filesystem_Base',
-        'direct' => 'WP_Filesystem_Direct',
-        'ftpext' => 'WP_Filesystem_FTPext',
-        'ftpsockets' => 'WP_Filesystem_ftpsockets',
-        'ssh2' => 'WP_Filesystem_SSH2',
-    );
-
-    $l = strtolower( $method );
-    if ( array_key_exists( $l, $map ) ) {
-        $classname = $map[ $l ];
-    } else {
-        $classname = "WP_Filesystem_{$method}";
-    }
-
-    if ( ! class_exists( $classname ) ) {
+    if ( ! class_exists( "WP_Filesystem_$method" ) ) {
 
         /**
@@ -919 +908 @@
         $abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
 
-        if ( ! file_exists( $abstraction_file ) ) {
+        if ( ! file_exists($abstraction_file) )
             return;
-        }
-
-        require_once( $abstraction_file );
-    }
-
-    $wp_filesystem = new $classname( $args );
+
+        require_once($abstraction_file);
+    }
+    $method = "WP_Filesystem_$method";
+
+    $wp_filesystem = new $method($args);
 
     //Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.