diff options
| -rw-r--r-- | app/controllers/help_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/contact_mailer.rb | 2 | ||||
| -rw-r--r-- | app/views/contact_mailer/to_admin_message.rhtml (renamed from app/views/contact_mailer/message.rhtml) | 0 | ||||
| -rw-r--r-- | lib/tasks/translation.rake | 2 | ||||
| -rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index cf90f45bb..d13b2655f 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -50,7 +50,7 @@ class HelpController < ApplicationController end @contact = ContactValidator.new(params[:contact]) if @contact.valid? && !params[:remove] - ContactMailer.deliver_message( + ContactMailer.deliver_to_admin_message( params[:contact][:name], params[:contact][:email], params[:contact][:subject], diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb index 16aae2f15..abde64928 100644 --- a/app/models/contact_mailer.rb +++ b/app/models/contact_mailer.rb @@ -7,7 +7,7 @@ class ContactMailer < ApplicationMailer # Send message to administrator - def message(name, email, subject, message, logged_in_user, last_request, last_body) + def to_admin_message(name, email, subject, message, logged_in_user, last_request, last_body) @from = name + " <" + email + ">" @recipients = contact_from_name_and_email @subject = subject diff --git a/app/views/contact_mailer/message.rhtml b/app/views/contact_mailer/to_admin_message.rhtml index 9c0a74c02..9c0a74c02 100644 --- a/app/views/contact_mailer/message.rhtml +++ b/app/views/contact_mailer/to_admin_message.rhtml diff --git a/lib/tasks/translation.rake b/lib/tasks/translation.rake index da282863e..ff07fc6f6 100644 --- a/lib/tasks/translation.rake +++ b/lib/tasks/translation.rake @@ -49,7 +49,7 @@ namespace :translation do write_email(followup_email, 'Follow up', output_file) # contact mailer - contact_email = ContactMailer.create_message(info_request.user_name, + contact_email = ContactMailer.create_to_admin_message(info_request.user_name, info_request.user.email, 'A test message', 'Hello!', diff --git a/spec/lib/sendmail_return_path_spec.rb b/spec/lib/sendmail_return_path_spec.rb index 7708edb35..137869b6e 100644 --- a/spec/lib/sendmail_return_path_spec.rb +++ b/spec/lib/sendmail_return_path_spec.rb @@ -28,7 +28,7 @@ describe "when sending email with an altered return path" do Net::SMTP.stub!(:new).and_return(mock_smtp) with_delivery_method :smtp do - ContactMailer.deliver_message( + ContactMailer.deliver_to_admin_message( "Mr. Test", "test@localhost", "Test script spec/lib/sendmail_return_path_spec.rb", "This is just a test for a test script", nil, nil, nil ) @@ -42,7 +42,7 @@ describe "when sending email with an altered return path" do with_stub_popen do IO.should_receive(:popen).once.with('/usr/sbin/sendmail -i -t -f "test@localhost"', "w+") with_delivery_method :sendmail do - ContactMailer.deliver_message( + ContactMailer.deliver_to_admin_message( "Mr. Test", "test@localhost", "Test script spec/lib/sendmail_return_path_spec.rb", "This is just a test for a test script", nil, nil, nil ) |