diff options
| -rw-r--r-- | app/controllers/help_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/contact_mailer/message.rhtml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 781214dc0..f701d38cf 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: help_controller.rb,v 1.4 2008-02-21 18:32:43 francis Exp $ +# $Id: help_controller.rb,v 1.5 2008-02-29 10:34:15 francis Exp $ class HelpController < ApplicationController @@ -24,7 +24,7 @@ class HelpController < ApplicationController params[:contact][:email], params[:contact][:subject], params[:contact][:message], - "IP #{request.env['REMOTE_HOST']}" + (@user ? (", logged in as user " + @user.email) : ", not logged in") + (@user ? ("logged in as user " + @user.email) : "not logged in") ) flash[:notice] = "Your message has been sent. Thank you for getting in touch! We'll get back to you soon." redirect_to frontpage_url diff --git a/app/views/contact_mailer/message.rhtml b/app/views/contact_mailer/message.rhtml index 70b56941d..119bf2dec 100644 --- a/app/views/contact_mailer/message.rhtml +++ b/app/views/contact_mailer/message.rhtml @@ -1,5 +1,5 @@ <%= @message.strip %> --------------------------------------------------------------------- -Message sent using contact form with <%= @request_details %> +Message sent using contact form, <%= @request_details %> --------------------------------------------------------------------- |