Ticket #15134: filesystem.patch

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

@@ -221 +221 @@
                         return false;
                 $file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise
 
+                if ( $this->is_link(untrailingslashit($file)) )
+                        return @unlink(untrailingslashit($file));
                 if ( $this->is_file($file) )
                         return @unlink($file);
                 if ( ! $recursive && $this->is_dir($file) )
@@ -253 +255 @@
                 return @is_dir($path);
         }
 
+        function is_link($path) {
+                return @is_link($path);
+        }
+
         function is_readable($file) {
                 return @is_readable($file);
         }

wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -252 +252 @@
         }
 
         function delete($file, $recursive = false) {
+                if ( $this->is_link(untrailingslashit($file)) )
+                        return ssh2_sftp_unlink($this->sftp_link, untrailingslashit($file));
                 if ( $this->is_file($file) )
                         return ssh2_sftp_unlink($this->sftp_link, $file);
                 if ( ! $recursive )
@@ -280 +282 @@
                 return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
         }
 
+        function is_link($path) {
+                $path = trim($path, '/');
+                return is_link('ssh2.sftp://' . $this->sftp_link . '/' . $path);
+        }
+
         function is_readable($file) {
                 $file = ltrim($file, '/');
                 return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);