diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-02-14 16:48:08 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-02-14 16:48:08 +0000 |
commit | d48bfd58f6ff26b2a34aa8d71d9d691f9fbc10e2 (patch) | |
tree | c026e8e6639f7f9ceed92b75fb8ed657c566d788 /app/controllers/help_controller.rb | |
parent | f8cf582f8c7461bfd680aac9c87cb5377c39c30c (diff) | |
parent | 0747a2d66f65fd22d8ea275d9df29a7981a46d07 (diff) |
Merge branch 'release/0.7' into wdtk
Diffstat (limited to 'app/controllers/help_controller.rb')
-rw-r--r-- | app/controllers/help_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index cf90f45bb..573abac63 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -19,7 +19,6 @@ class HelpController < ApplicationController def contact @contact_email = Configuration::contact_email - @contact_email = @contact_email.gsub(/@/, "@") # if they clicked remove for link to request/body, remove it if params[:remove] @@ -50,7 +49,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], |