public
Fork of technoweenie/attachment_fu
Description: Treat an ActiveRecord model as a file attachment, storing its patch, size, content type, etc.
Homepage: http://weblog.techno-weenie.net
Clone URL: git://github.com/nicksieger/attachment_fu.git
Search Repo:
Merge branch 'master' of git://github.com/technoweenie/attachment_fu
nicksieger (author)
Tue Mar 04 07:25:24 -0800 2008
commit  b0da755535a196c8a12e4f0c58cfc5cafda4f6e2
tree    b299b78a47e2c72dacdf9a3b8ad5d039024bad7d
parent  cd0229e3ae1cf03612d667d4880f13ce7fea1288 parent  704d91bcaa76ee9e0ed07222f7916b166fb79ca7
...
68
69
70
71
 
72
73
74
...
68
69
70
 
71
72
73
74
0
@@ -68,7 +68,7 @@
0
           with_options :foreign_key => 'parent_id' do |m|
0
             m.has_many :thumbnails, :class_name => attachment_options[:thumbnail_class].to_s
0
             m.belongs_to :parent, :class_name => base_class.to_s
0
- end
0
+ end unless options[:thumbnails].empty?
0
           before_destroy :destroy_thumbnails
0
 
0
           before_validation :set_size_from_temp_path
...
162
163
164
165
 
166
167
168
...
162
163
164
 
165
166
167
168
0
@@ -162,7 +162,7 @@
0
         end
0
         
0
         def self.port_string
0
- @port_string ||= s3_config[:port] == (s3_config[:use_ssl] ? 443 : 80) ? '' : ":#{s3_config[:port]}"
0
+ @port_string ||= (s3_config[:port].nil? || s3_config[:port] == (s3_config[:use_ssl] ? 443 : 80)) ? '' : ":#{s3_config[:port]}"
0
         end
0
 
0
         module ClassMethods

Comments

    No one has commented yet.