projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee9ac19
)
Mark some flash messages as html safe
author
Tom Hughes
<tom@compton.nu>
Thu, 27 Aug 2015 19:43:50 +0000
(20:43 +0100)
committer
Tom Hughes
<tom@compton.nu>
Thu, 27 Aug 2015 19:43:50 +0000
(20:43 +0100)
app/controllers/user_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/user_controller.rb
b/app/controllers/user_controller.rb
index 0f77c87a0966dcf4dab318bbc8cabb6f64e5eb97..37f9cd7c204d0c73a8a24ac97d23e60f8267792c 100644
(file)
--- a/
app/controllers/user_controller.rb
+++ b/
app/controllers/user_controller.rb
@@
-45,7
+45,7
@@
class UserController < ApplicationController
@user.terms_seen = true
if @user.save
@user.terms_seen = true
if @user.save
- flash[:notice] = t
"user.new.terms declined", :url => t("user.new.terms declined url")
+ flash[:notice] = t
("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
end
if params[:referer]
end
if params[:referer]
@@
-330,7
+330,7
@@
class UserController < ApplicationController
flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
else
Notifier.signup_confirm(user, user.tokens.create).deliver_now
flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
else
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 => user.email).html_safe
end
redirect_to :action => "login"
end
redirect_to :action => "login"