fixes #2610: Strip image metadata when creating thumbnails and samples

This commit is contained in:
r888888888 2016-06-15 11:38:35 -07:00
parent 505f3f7c03
commit 4fea400b79
3 changed files with 4 additions and 1 deletions

View File

@ -58,6 +58,8 @@ class BulkUpdateRequest < ActiveRecord::Base
msg += "#{line}\n" msg += "#{line}\n"
end end
self.approver_id = User.admins.first.id if approver.nil?
dmail = Dmail.new( dmail = Dmail.new(
:from_id => approver.id, :from_id => approver.id,
:to_id => approver.id, :to_id => approver.id,

View File

@ -15,6 +15,7 @@ module Danbooru
end end
image = flatten(image, width, height) image = flatten(image, width, height)
image.strip!
image.write(write_path) do image.write(write_path) do
self.quality = resize_quality self.quality = resize_quality

View File

@ -106,7 +106,7 @@ class BulkUpdateRequestsControllerTest < ActionController::TestCase
end end
end end
context "1234 for an admin" do context "for an admin" do
should "succeed" do should "succeed" do
post :approve, {:id => @bulk_update_request.id}, {:user_id => @admin.id} post :approve, {:id => @bulk_update_request.id}, {:user_id => @admin.id}
@bulk_update_request.reload @bulk_update_request.reload