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

Timestamp:

04/13/2009 04:11:02 PM (17 years ago)

Author:

ryan

Message:

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