X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d736a158bee0ff17bdba30496b87e1bfe20e2910..2b596387d2d0ede41a77d36c17195b1a85a6e7b0:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index eccc006c2..61c76898a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,6 +11,7 @@ class User < ActiveRecord::Base
   has_many :preferences, :class_name => "UserPreference"
 
   validates_presence_of :email, :display_name
+  validates_confirmation_of :email, :message => 'Email addresses must match'
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
@@ -24,6 +25,8 @@ class User < ActiveRecord::Base
 
   before_save :encrypt_password
 
+  file_column :image, :magick => { :geometry => "100x100>" }
+
   def after_initialize
     self.creation_time = Time.now if self.creation_time.nil?
   end
@@ -73,7 +76,7 @@ class User < ActiveRecord::Base
     return el1
   end
 
-  def nearby(radius = 50, num = 5)
+  def nearby(radius = 50, num = 10)
     if self.home_lon and self.home_lat 
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)