Changeset 10930 for trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

Timestamp:

04/14/2009 05:16:44 PM (17 years ago)

Author:

ryan

Message:

Revert FTP parts of [10919]. fixes #9535 see #9525

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (4 diffs)

trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -187 +187 @@
         function getchmod($file) {
                 $dir = $this->dirlist($file);
-                return $this->getnumchmodfromh( $dir[basename($file)]['perms'] );
+                return $dir[$file]['permsn'];
         }
 
@@ -282 +282 @@
 
         function dirlist($path = '.', $incdot = false, $recursive = false ) {
-
-                if ( substr($path, -1) !== '/') {
-                        $limit = basename($path);
-                        $path = trailingslashit(dirname($path));
+                if( $this->is_file($path) ) {
+                        $limitFile = basename($path);
+                        $path = dirname($path) . '/';
                 } else {
-                        $limit = false;
+                        $limitFile = false;
                 }
 
@@ -293 +292 @@
                 if( ! $list )
                         return false;
-
                 if( empty($list) )
                         return array();
@@ -299 +297 @@
                 $ret = array();
                 foreach ( $list as $struc ) {
-                        if ( $limit && $struc['name'] != $limit )
-                                continue;
 
                         if ( 'd' == $struc['type'] ) {