X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bc233420dd0d0cb7c1226f8c7f4baf29ad1f754d..6f09f5d49ce117c0f34c7c82b80b19fdccb873cf:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0538d0409..121d050b5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -123,7 +123,7 @@ class UsersController < ApplicationController :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org] ) - if params[:user] && params[:user][:display_name] && params[:user][:description] + if request.post? if params[:user][:auth_provider].blank? || (params[:user][:auth_provider] == current_user.auth_provider && params[:user][:auth_uid] == current_user.auth_uid) @@ -131,7 +131,7 @@ class UsersController < ApplicationController redirect_to user_account_url(current_user) if current_user.errors.count.zero? else session[:new_user_settings] = params - redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid]) + redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid]), :status => :temporary_redirect end elsif errors = session.delete(:user_errors) errors.each do |attribute, error| @@ -151,7 +151,7 @@ class UsersController < ApplicationController def lost_password @title = t "users.lost_password.title" - if params[:email] + if request.post? user = User.visible.find_by(:email => params[:email]) if user.nil? @@ -276,7 +276,7 @@ class UsersController < ApplicationController session[:referer] = safe_referer(params[:referer]) if params[:referer] - if params[:username].present? && params[:password].present? + if request.post? session[:remember_me] ||= params[:remember_me] password_authentication(params[:username], params[:password]) end