Update Potlatch 2 to 2.3-207-g44e9559 build

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index cc538966348dca7936dcd66061f860dda0d6b10a..9a230898a87779160d1038cac73b1e0ef498b2a3 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -44,7 +44,9 @@ class User < ActiveRecord::Base
   after_initialize :set_creation_time
   before_save :encrypt_password
 
-  file_column :image, :magick => { :geometry => "100x100>" }
+  has_attached_file :image, 
+    :default_url => "/assets/:class/:attachment/:style.png",
+    :styles => { :large => "100x100>", :small => "50x50>" }
 
   def self.authenticate(options)
     if options[:username] and options[:password]