Skip to content

Commit

Permalink
Merge pull request #556 from anoras/master
Browse files Browse the repository at this point in the history
Fixed bug in MimeTypes integration when setting the content type through an instance variable.
  • Loading branch information
bensie committed Dec 15, 2011
2 parents e9260c9 + f75ae65 commit c925725
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/carrierwave/processing/mime_types.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def set_content_type(override=false)
if file.respond_to?(:content_type=)
file.content_type = new_content_type
else
file.set_instance_variable(:@content_type, new_content_type)
file.instance_variable_set(:@content_type, new_content_type)
end
end
rescue ::MIME::InvalidContentType => e
Expand Down

0 comments on commit c925725

Please sign in to comment.