WordPress 4.2

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

diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 90e3de02745456272f92284b54dbd34f03a48cf6..f9f46e7c81d003cf17db77259defdc95617ea8db 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -16,8 +16,6 @@
  */
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
        public $link;
-       public $errors = null;
-       public $options = array();
 
        public function __construct($opt='') {
                $this->method = 'ftpext';
@@ -26,7 +24,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
                // Check if possible to use ftp functions.
                if ( ! extension_loaded('ftp') ) {
                        $this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
-                       return false;
+                       return;
                }
 
                // This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
@@ -44,9 +42,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
                else
                        $this->options['hostname'] = $opt['hostname'];
 
-               if ( ! empty($opt['base']) )
-                       $this->wp_base = $opt['base'];
-
                // Check if the options provided are OK.
                if ( empty($opt['username']) )
                        $this->errors->add('empty_username', __('FTP username is required'));
@@ -89,7 +84,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
        /**
         * @param string $file
-        * @return bool|string
+        * @return false|string
         */
        public function get_contents( $file ) {
                $tempfile = wp_tempnam($file);
@@ -175,15 +170,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
                return @ftp_chdir($this->link, $dir);
        }
 
-       /**
-        * @param string $file
-        * @param bool $group
-        * @param bool $recursive
-        */
-       public function chgrp($file, $group, $recursive = false ) {
-               return false;
-       }
-
        /**
         * @param string $file
         * @param int $mode
@@ -289,6 +275,11 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
         */
        public function exists($file) {
                $list = @ftp_nlist($this->link, $file);
+
+               if ( empty( $list ) && $this->is_dir( $file ) ) {
+                       return true; // File is an empty directory.
+               }
+
                return !empty($list); //empty list = no file, so invert.
        }
        /**
@@ -370,10 +361,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
                if ( !@ftp_mkdir($this->link, $path) )
                        return false;
                $this->chmod($path, $chmod);
-               if ( $chown )
-                       $this->chown($path, $chown);
-               if ( $chgrp )
-                       $this->chgrp($path, $chgrp);
                return true;
        }