IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.

Built from https://develop.svn.wordpress.org/trunk@38411


git-svn-id: http://core.svn.wordpress.org/trunk@38352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
2016-08-27 22:32:37 +00:00
parent 1798d34f73
commit 390ceba6c7
46 changed files with 39 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -737,8 +737,6 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
mbstring_binary_safe_encoding();
require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
$archive = new PclZip($file);
$archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING);
@@ -886,14 +884,27 @@ function copy_dir($from, $to, $skip_list = array() ) {
function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
global $wp_filesystem;
require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
if ( ! $method )
return false;
if ( ! class_exists( "WP_Filesystem_$method" ) ) {
$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 ) ) {
/**
* Filters the path for a specific filesystem method class file.
@@ -907,14 +918,14 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
*/
$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);
require_once( $abstraction_file );
}
$method = "WP_Filesystem_$method";
$wp_filesystem = new $method($args);
$wp_filesystem = new $classname( $args );
//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
if ( ! defined('FS_CONNECT_TIMEOUT') )