From: Tom Hughes Date: Mon, 5 Jun 2017 21:30:50 +0000 (+0100) Subject: Replace deprecated env method with request.env X-Git-Tag: live~3376 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d4df87c1e16bd854f37ff6c4a7bf7e9d2d5ee3e0?hp=4248e10946c9f60020112c969591b867c6f8fb19;ds=inline Replace deprecated env method with request.env --- diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 430051c17..6b5079831 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -496,7 +496,7 @@ class UserController < ApplicationController ## # omniauth success callback def auth_success - auth_info = env["omniauth.auth"] + auth_info = request.env["omniauth.auth"] provider = auth_info[:provider] uid = auth_info[:uid] @@ -545,7 +545,7 @@ class UserController < ApplicationController when "pending" then unconfirmed_login(user) when "active", "confirmed" then - successful_login(user, env["omniauth.params"]["referer"]) + successful_login(user, request.env["omniauth.params"]["referer"]) when "suspended" then failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}") else