Deletes thumbnails when the attachment diskfile is deleted (#30177).

Patch by Jens Krämer.


git-svn-id: http://svn.redmine.org/redmine/trunk@17736 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 9 insertions, 1 deletions

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index fd4931eaf..ac9561c26 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -216,7 +216,7 @@ class Attachment < ActiveRecord::Base
         size = Setting.thumbnails_size.to_i
       end
       size = 100 unless size > 0
-      target = File.join(self.class.thumbnails_storage_path, "#{digest}_#{filesize}_#{size}.thumb")
+      target = thumbnail_path(size)
 
       begin
         Redmine::Thumbnail.generate(self.diskfile, target, size)
@@ -463,6 +463,14 @@ class Attachment < ActiveRecord::Base
     if disk_filename.present? && File.exist?(diskfile)
       File.delete(diskfile)
     end
+    Dir[thumbnail_path("*")].each do |thumb|
+      File.delete(thumb)
+    end
+  end
+
+  def thumbnail_path(size)
+    File.join(self.class.thumbnails_storage_path,
+              "#{digest}_#{filesize}_#{size}.thumb")
   end
 
   def sanitize_filename(value)