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

Timestamp:

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

Author:

ryan

Message:

WPFS cleanups. Props DD32. fixes #9525

File:

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

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

@@ -170 +170 @@
         function getchmod($file) {
                 $dir = $this->dirlist($file);
-                return $dir[$file]['permsn'];
+                return $this->getnumchmodfromh( $dir[basename($file)]['perms'] );
         }
         function group($file) {
@@ -188 +188 @@
         }
 
-        function delete($file,$recursive=false) {
+        function delete($file ,$recursive = false ) {
+                if ( empty($file) )
+                        return false;
                 if ( $this->is_file($file) )
                         return @ftp_delete($this->link, $file);
@@ -322 +324 @@
 
         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;
                 }
 
@@ -340 +343 @@
                                 continue;
 
-                        if ( '.' == $entry["name"] || '..' == $entry["name"] )
+                        if ( '.' == $entry['name'] || '..' == $entry['name'] )
+                                continue;
+
+                        if ( $limit && $entry['name'] != $limit )
                                 continue;