WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filesystem: Revert [33648] and [34733] unfortunately these have caused issues for some servers, while fixing it for others. 

See #28013

Fixes #34976 for trunk
Fixes #34976 for trunk

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


git-svn-id: http://core.svn.wordpress.org/trunk@35908 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-12-15 02:36:28 +00:00
parent 3fdb8bafc4
commit bda1b2ace9
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/class-wp-filesystem-ftpext.php
View File

@ -331,16 +331,14 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
* @param string $file
* @return bool
*/
public function exists( $file ) {
$path = dirname( $file );
$filename = basename( $file );
public function exists($file) {
$list = @ftp_nlist($this->link, $file);
$file_list = @ftp_nlist( $this->link, '-a ' . $path );
if ( $file_list ) {
$file_list = array_map( 'basename', $file_list );
if ( empty( $list ) && $this->is_dir( $file ) ) {
return true; // File is an empty directory.
}
return $file_list && in_array( $filename, $file_list );
return !empty($list); //empty list = no file, so invert.
}
/**

2
wp-admin/includes/class-wp-filesystem-ftpsockets.php
View File

@ -342,7 +342,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
* @return bool
*/
public function exists( $file ) {
$list = $this->ftp->rawlist( $file, '-a' );
$list = $this->ftp->nlist( $file );
if ( empty( $list ) && $this->is_dir( $file ) ) {
return true; // File is an empty directory.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-35943';
$wp_version = '4.5-alpha-35944';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.