Merge remote-tracking branch 'upstream/pull/3394'

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 38a61208c4635120ea9864a65dfd360728914baa..23263ebba2267a8815988d43ca06fae1afcf28e4 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -44,11 +44,9 @@ class UsersController < ApplicationController
 
         flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
 
 
         flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
 

-        if params[:referer]
-          redirect_to safe_referer(params[:referer])
-        else
-          redirect_to user_account_path(current_user)
-        end
+        referer = safe_referer(params[:referer]) if params[:referer]
+
+        redirect_to referer || user_account_path(current_user)

       elsif params[:decline]
         redirect_to t("users.terms.declined")
       else
       elsif params[:decline]
         redirect_to t("users.terms.declined")
       else


@@ -64,11 +62,9 @@ class UsersController < ApplicationController
         flash[:notice] = t "users.new.terms accepted" if current_user.save
       end
 
         flash[:notice] = t "users.new.terms accepted" if current_user.save
       end
 

-      if params[:referer]
-        redirect_to safe_referer(params[:referer])
-      else
-        redirect_to user_account_path(current_user)
-      end
+      referer = safe_referer(params[:referer]) if params[:referer]
+
+      redirect_to referer || user_account_path(current_user)

     else
       self.current_user = session.delete(:new_user)
 
     else
       self.current_user = session.delete(:new_user)
 


@@ -335,8 +331,11 @@ class UsersController < ApplicationController
   ##
   # omniauth failure callback
   def auth_failure
   ##
   # omniauth failure callback
   def auth_failure

-    flash[:error] = t("users.auth_failure.#{params[:message]}")
-    redirect_to params[:origin] || login_url
+    flash[:error] = t(params[:message], :scope => "users.auth_failure", :default => t("users.auth_failure.unknown_error"))
+
+    origin = safe_referer(params[:origin]) if params[:origin]
+
+    redirect_to origin || login_url

   end
 
   private
   end
 
   private