Download as
Browse Code »

Commit 7b9da6d648662f0f3f0d30e4c574c477aebb35fa

Authored by Leandro Santos
2 parents 5e21a570 1d932cf7
Exists in staging and in 1 other branch production

Merge branch 'master' into staging

Showing 3 changed files with 12 additions and 2 deletions   Show diff stats
app/helpers/email_template_helper.rb
  Diff comments   View file @7b9da6d
... ... @@ -6,7 +6,7 @@ module EmailTemplateHelper
6 6 params[:subject] = params[:email_template].parsed_subject(params[:template_params])
7 7 params[:content_type] = "text/html"
8 8 end
9   - mail(params.except(:email_template))
  9 + mail(params.except(:email_template, :template_params))
10 10 end
11 11  
12 12 end
... ...
app/views/account/_signup_form.html.erb
  Diff comments   View file @7b9da6d
... ... @@ -111,7 +111,7 @@
111 111  
112 112 <% unless @terms_of_use.blank? %>
113 113 <div id='terms-of-use-box' class='formfieldline'>
114   - <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
  114 + <%= labelled_check_box(_('I accept the %s').html_safe % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
115 115 </div>
116 116 <% end %>
117 117  
... ...
test/unit/user_mailer_test.rb
  Diff comments   View file @7b9da6d
... ... @@ -44,6 +44,16 @@ fast_create(Person))
44 44 assert_equal 'activation template body', mail.body.to_s
45 45 end
46 46  
  47 + should 'not leak template params into activation email' do
  48 + EmailTemplate.create!(:template_type => :user_activation, :name => 'template1', :subject => 'activation template subject', :body => 'activation template body', :owner => Environment.default)
  49 + assert_difference 'ActionMailer::Base.deliveries.size' do
  50 + u = create_user('some-user')
  51 + UserMailer.activation_code(u).deliver
  52 + end
  53 + mail = ActionMailer::Base.deliveries.last
  54 + assert_nil mail['template-params']
  55 + end
  56 +
47 57 private
48 58  
49 59 def read_fixture(action)
... ...