Merge branch 'master' of github.com:r888888888/danbooru

2013-03-31 21:43:53 -04:00
parent fb7b82d60a 08b41bfa95
commit f07379697b
1 changed files with 1 additions and 1 deletions
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -206,7 +206,7 @@ class Upload < ActiveRecord::Base

    def content_type_to_file_ext(content_type)
      case content_type
-      when "image/jpeg"
+      when "image/jpeg", "image/jpg"
        "jpg"

      when "image/gif"