Merge pull request #263 from pifleo/patch-1

Update attachment.rb, set back S3/Heroku behavior
kandanapp · Jun 1, 2013 · 89ef4d9 · 89ef4d9
2 parents e041142 + 0cf5bef
commit 89ef4d9
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
@@ -1,9 +1,9 @@
 class Attachment < ActiveRecord::Base
   belongs_to :channel
   belongs_to :user
-
-=begin
-  has_attached_file(:file, {
+  
+  if ENV['S3_BUCKET']
+    has_attached_file(:file, {
       :storage         => :s3,
       :s3_credentials  => {
         :access_key_id     => ENV['S3_ACCESS_KEY_ID'],
@@ -14,9 +14,10 @@ class Attachment < ActiveRecord::Base
       :url    => "/:attachment/:id/:style/:basename.:extension",
       :path   => "#{ENV['S3_PREFIX']}/:attachment/:id/:style/:basename.:extension"
     })
-=end
-
-  has_attached_file :file
+  else
+    has_attached_file :file
+  end
+
   attr_accessible :file
 
   def url