Merge branch 'master' into next

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 2a0a5ab4508f2c193c048cf3eeb24edff5262fdc..aaa00169f5210f2ac5fda89f0e1b8bd5d839811e 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,6 +117,7 @@ class User < ActiveRecord::Base
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check

+  after_save :reset_preferred_languages

 
   def to_param
     display_name
 
   def to_param
     display_name


@@ -197,6 +198,10 @@ class User < ActiveRecord::Base
     @preferred_languages ||= Locale.list(languages)
   end
 
     @preferred_languages ||= Locale.list(languages)
   end
 

+  def reset_preferred_languages
+    @preferred_languages = nil
+  end
+

   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)