WordPress 4.1

[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 f068f157bd8224e073d02b8948e24e4aa88ae892..01e585bf9d044ac49dcb9e7e9fe14e5a68871a16 100644 (file)
--- a/wp-admin/includes/class-ftp.php
+++ b/wp-admin/includes/class-ftp.php
@@ -504,7 +504,7 @@ class ftp_base {
                return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist");
        }
 
-       function nlist($pathname="") {
+       function nlist($pathname="", $arg="") {
                return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist");
        }
 
@@ -903,5 +903,4 @@ if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) {
        $mod_sockets = extension_loaded( 'sockets' );
 }
 
-require_once "class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
-?>
+require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";