WordPress.org

Make WordPress Core


Ignore:
Timestamp:
08/27/2016 10:31:11 PM (5 years ago)
Author:
wonderboymusic
Message:

Bootstrap: after r38409 and r38410, revert r38402 which reverted r38399.

This fixes the paths in wp-vendor/ that were including src. I want to drop this in so we can find out what else will break.

See #36335.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/file.php

    r38402 r38411  
    738738    mbstring_binary_safe_encoding();
    739739
    740     require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
    741 
    742740    $archive = new PclZip($file);
    743741
     
    887885    global $wp_filesystem;
    888886
    889     require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
    890 
    891887    $method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
    892888
     
    894890        return false;
    895891
    896     if ( ! class_exists( "WP_Filesystem_$method" ) ) {
     892    $map = array(
     893        'base' => 'WP_Filesystem_Base',
     894        'direct' => 'WP_Filesystem_Direct',
     895        'ftpext' => 'WP_Filesystem_FTPext',
     896        'ftpsockets' => 'WP_Filesystem_ftpsockets',
     897        'ssh2' => 'WP_Filesystem_SSH2',
     898    );
     899
     900    $l = strtolower( $method );
     901    if ( array_key_exists( $l, $map ) ) {
     902        $classname = $map[ $l ];
     903    } else {
     904        $classname = "WP_Filesystem_{$method}";
     905    }
     906
     907    if ( ! class_exists( $classname ) ) {
    897908
    898909        /**
     
    908919        $abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
    909920
    910         if ( ! file_exists($abstraction_file) )
     921        if ( ! file_exists( $abstraction_file ) ) {
    911922            return;
    912 
    913         require_once($abstraction_file);
    914     }
    915     $method = "WP_Filesystem_$method";
    916 
    917     $wp_filesystem = new $method($args);
     923        }
     924
     925        require_once( $abstraction_file );
     926    }
     927
     928    $wp_filesystem = new $classname( $args );
    918929
    919930    //Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
Note: See TracChangeset for help on using the changeset viewer.