Temporary fix to avoid showing emails

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index fcd330ec34abf5b7e2eca0d3d6d453bd4f5be40a..8a5fa3fe1b0bb62fb27166d791cce513e77039d0 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -325,7 +325,7 @@ class UserController < ApplicationController
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])
       Notifier.signup_confirm(user, user.tokens.create).deliver_now
-      flash[:notice] = t "user.confirm_resend.success", :email => user.email
+      flash[:notice] = t "user.confirm_resend.success", :email => "your email" # user.email
     else
       flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
     end
@@ -545,7 +545,7 @@ class UserController < ApplicationController
   # omniauth failure callback
   def auth_failure
     flash[:error] = t("user.auth_failure." + params[:message])
-    redirect_to params[:origin]
+    redirect_to params[:origin] || login_url
   end
 
   private