Remove if_user and similar methods

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 9c99c36a6d7a4bb52391bd1c26772dfe58907d3e..da3964142fb60a3c65e4bca7704a0b72a9eca2c5 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -113,6 +113,10 @@ class User < ActiveRecord::Base
   before_save :update_tile
   after_save :spam_check
 
+  def to_param
+    display_name
+  end
+
   def self.authenticate(options)
     if options[:username] && options[:password]
       user = find_by("email = ? OR display_name = ?", options[:username], options[:username])
@@ -185,7 +189,7 @@ class User < ActiveRecord::Base
   end
 
   def preferred_languages
-    @locales ||= Locale.list(languages)
+    @preferred_languages ||= Locale.list(languages)
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)