WordPress 4.7

[autoinstalls/wordpress.git] / wp-admin / includes / class-ftp.php

diff --git a/wp-admin/includes/class-ftp.php b/wp-admin/includes/class-ftp.php
index 4f75e409f8faeaf07933a3be57617dac8b157db7..35f670ff385abb1c17da1444cda8e3ed0503f18a 100644 (file)
--- a/wp-admin/includes/class-ftp.php
+++ b/wp-admin/includes/class-ftp.php
@@ -694,7 +694,7 @@ class ftp_base {
                }
                foreach($list as $k=>$v) {
                        $list[$k]=$this->parselisting($v);
-                       if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+                       if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
                }
                $ret=true;
                foreach($list as $el) {
@@ -727,7 +727,7 @@ class ftp_base {
 
                foreach($list as $k=>$v) {
                        $list[$k]=$this->parselisting($v);
-                       if($list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
+                       if( ! $list[$k] or $list[$k]["name"]=="." or $list[$k]["name"]=="..") unset($list[$k]);
                }
                $ret=true;
 
@@ -818,7 +818,7 @@ class ftp_base {
        function glob_regexp($pattern,$probe) {
                $sensitive=(PHP_OS!='WIN32');
                return ($sensitive?
-                       preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) : 
+                       preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
                        preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
                );
        }
@@ -904,3 +904,9 @@ if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) {
 }
 
 require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
+
+if ( $mod_sockets ) {
+       class ftp extends ftp_sockets {}
+} else {
+       class ftp extends ftp_pure {}
+}