X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3cfffc2258621558e1147ceaf63980a7f6ed414b..5aa255e13fd5a9adfd7258cd7048466fc63f2347:/app/controllers/users_controller.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a3c21cd3d..a61a10d94 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -376,7 +376,7 @@ class UsersController < ApplicationController @user = User.find_by(:display_name => params[:display_name]) if @user && - (@user.visible? || (current_user&.administrator?)) + (@user.visible? || current_user&.administrator?) @title = @user.display_name else render_unknown_user params[:display_name] @@ -520,11 +520,11 @@ class UsersController < ApplicationController if user case user.status - when "pending" then + when "pending" unconfirmed_login(user) - when "active", "confirmed" then + when "active", "confirmed" successful_login(user, request.env["omniauth.params"]["referer"]) - when "suspended" then + when "suspended" failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe else failed_login t("users.login.auth failure")