Ticket #36710: 36710.diff

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

@@ -299 +299 @@
 
                 if ( 'f' == $type || $this->is_file($file) )
                         return @unlink($file);
+                if ( $this->is_dir($file) && $this->is_link($file) )
+                        return @unlink(rtrim($file, '/'));
                 if ( ! $recursive && $this->is_dir($file) )
                         return @rmdir($file);
 
@@ -346 +348 @@
         public function is_dir($path) {
                 return @is_dir($path);
         }
+        /**
+         * @access public
+         *
+         * @param string $path
+         * @return bool
+         */
+        public function is_link($path) {
+                return @is_link(rtrim($path, '/'));
+        }
 
         /**
          * @access public