Mark account suspended flash message as HTML safe

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index b6fc79b25151db50f9f935699b21c7efc6d839c9..f80df8623623cf3e4693d8d33217542149c64e7a 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -268,7 +268,7 @@ class UserController < ApplicationController
   def logout
     @title = t "user.logout.title"
 
   def logout
     @title = t "user.logout.title"
 

-    if params[:session] == request.session_options[:id]
+    if params[:session] == session.id

       if session[:token]
         token = UserToken.find_by(:token => session[:token])
         token.destroy if token
       if session[:token]
         token = UserToken.find_by(:token => session[:token])
         token.destroy if token


@@ -547,7 +547,7 @@ class UserController < ApplicationController
         when "active", "confirmed" then
           successful_login(user, request.env["omniauth.params"]["referer"])
         when "suspended" then
         when "active", "confirmed" then
           successful_login(user, request.env["omniauth.params"]["referer"])
         when "suspended" then

-          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}")
+          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe

         else
           failed_login t("user.login.auth failure")
         end
         else
           failed_login t("user.login.auth failure")
         end


@@ -575,7 +575,7 @@ class UserController < ApplicationController
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)

-      failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}"), username
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username

     else
       failed_login t("user.login.auth failure"), username
     end
     else
       failed_login t("user.login.auth failure"), username
     end