← Back to branch summary

~canonical-sysadmins/wordpress/4.7

« back to all changes in this revision

Viewing changes to wp-admin/includes/class-ftp.php

  • Committer: Nick Moffitt
  • Date: 2015-01-15 11:04:26 UTC
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: nick.moffitt@canonical.com-20150115110426-5stm1p14cfnxrtme
New Upstream Version 4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-ftp.php
504
504
                return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "LIST", "rawlist");
505
505
        }
506
506
 
507
 
        function nlist($pathname="") {
 
507
        function nlist($pathname="", $arg="") {
508
508
                return $this->_list(($arg?" ".$arg:"").($pathname?" ".$pathname:""), "NLST", "nlist");
509
509
        }
510
510
 
903
903
        $mod_sockets = extension_loaded( 'sockets' );
904
904
}
905
905
 
906
 
require_once "class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
907
 
?>
 
906
require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";