Bump dalli from 2.7.10 to 2.7.11

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ed9c124b14b2b1983dee504132f7e69e612152d8..aa115a2282fee7b3072f73f46b07cb94fe7f3f6b 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -146,11 +146,11 @@ class UsersController < ApplicationController
   def lost_password
     @title = t "users.lost_password.title"
 
-    if params[:user] && params[:user][:email]
-      user = User.visible.find_by(:email => params[:user][:email])
+    if params[:email]
+      user = User.visible.find_by(:email => params[:email])
 
       if user.nil?
-        users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
+        users = User.visible.where("LOWER(email) = LOWER(?)", params[:email])
 
         user = users.first if users.count == 1
       end
@@ -616,13 +616,13 @@ class UsersController < ApplicationController
     user.languages = params[:user][:languages].split(",")
 
     case params[:avatar_action]
-    when "new" then
+    when "new"
       user.avatar.attach(params[:user][:avatar])
       user.image_use_gravatar = false
-    when "delete" then
+    when "delete"
       user.avatar.purge_later
       user.image_use_gravatar = false
-    when "gravatar" then
+    when "gravatar"
       user.avatar.purge_later
       user.image_use_gravatar = true
     end