WordPress 4.2.2

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

diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index bb7e0c2e6293ad1fcc22a8f06be46cd7962c17a1..ec85d36b7b81ba0ee527baffc75fe8226b3e79ea 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -15,9 +15,10 @@
  * @uses WP_Filesystem_Base Extends class
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
-       public $ftp = false;
-       public $errors = null;
-       public $options = array();
+       /**
+        * @var ftp
+        */
+       public $ftp;
 
        public function __construct($opt = '') {
                $this->method = 'ftpsockets';
@@ -25,7 +26,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
                // Check if possible to use ftp functions.
                if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) {
-                       return false;
+                       return;
                }
                $this->ftp = new ftp();
 
@@ -39,9 +40,6 @@ class WP_Filesystem_ftpsockets 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'));
@@ -83,7 +81,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
        /**
         * @param string $file
-        * @return bool|string
+        * @return false|string
         */
        public function get_contents( $file ) {
                if ( ! $this->exists($file) )
@@ -176,15 +174,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $this->ftp->chdir($file);
        }
 
-       /**
-        * @param string $file
-        * @param bool $group
-        * @param bool $recursive
-        */
-       public function chgrp($file, $group, $recursive = false ) {
-               return false;
-       }
-
        /**
         * @param string $file
         * @param int|bool $mode
@@ -285,6 +274,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
         */
        public function exists( $file ) {
                $list = $this->ftp->nlist( $file );
+
+               if ( empty( $list ) && $this->is_dir( $file ) ) {
+                       return true; // File is an empty directory.
+               }
+
                return !empty( $list ); //empty list = no file, so invert.
                // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
        }
@@ -380,10 +374,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                if ( ! $chmod )
                        $chmod = FS_CHMOD_DIR;
                $this->chmod($path, $chmod);
-               if ( $chown )
-                       $this->chown($path, $chown);
-               if ( $chgrp )
-                       $this->chgrp($path, $chgrp);
                return true;
        }