Changeset 6920

Timestamp:

02/20/2008 12:15:55 AM (17 years ago)

Author:

ryan

Message:

fs direct fixes from DD32. see #5586

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (2 diffs)
• update.php (modified) (1 diff)

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

@@ -3 +3 @@
 class WP_Filesystem_Direct{
     var $permission = null;
+    var $errors = array();
     function WP_Filesystem_Direct($arg){
+        $this->errors = new WP_Error();
         $this->permission = umask();
     }
@@ -189 +191 @@
     function delete($file,$recursive=false){
         $file = str_replace('\\','/',$file); //for win32, occasional problems deleteing files otherwise
+
         if( $this->is_file($file) )
             return @unlink($file);
-        if( !$recursive )
+
+        if( !$recursive && $this->is_dir($file) )
             return @rmdir($file);
+
         $filelist = $this->dirlist($file);
+        if( ! $filelist )
+            return true; //No files exist, Say we've deleted them
 
         $retval = true;

trunk/wp-admin/includes/update.php

@@ -179 +179 @@
 
     // If plugin is in its own directory, recursively delete the directory.
-    if ( '.' != $plugin_dir )
+    if ( '.' != $plugin_dir && ABSPATH . PLUGINDIR != $plugin_dir )
         $wp_filesystem->delete($plugin_dir, true);