diff options
| -rw-r--r-- | app/controllers/user_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/contact_mailer.rb | 6 | ||||
| -rw-r--r-- | app/views/contact_mailer/user_message.rhtml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 7eb506337..14cc9ac06 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user_controller.rb,v 1.38 2008-03-13 00:14:17 francis Exp $ +# $Id: user_controller.rb,v 1.39 2008-03-13 12:33:40 francis Exp $ class UserController < ApplicationController # Show page about a set of users with same url name @@ -193,7 +193,7 @@ class UserController < ApplicationController ContactMailer.deliver_user_message( @user, @recipient_user, - main_url(user_url(@recipient_user)), + main_url(user_url(@user)), params[:contact][:subject], params[:contact][:message] ) diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb index de6a6ee58..e3d1d3c71 100644 --- a/app/models/contact_mailer.rb +++ b/app/models/contact_mailer.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: contact_mailer.rb,v 1.4 2008-03-12 13:01:04 francis Exp $ +# $Id: contact_mailer.rb,v 1.5 2008-03-13 12:33:40 francis Exp $ class ContactMailer < ApplicationMailer @@ -19,7 +19,7 @@ class ContactMailer < ApplicationMailer end # Send message to another user - def user_message(from_user, recipient_user, recipient_url,subject, message) + def user_message(from_user, recipient_user, from_user_url, subject, message) @from = from_user.name_and_email # Do not set envelope from address to the from_user, so they can't get # someone's email addresses from transitory bounce messages. @@ -31,7 +31,7 @@ class ContactMailer < ApplicationMailer :message => message, :from_user => from_user, :recipient_user => recipient_user, - :recipient_url => recipient_url + :from_user_url => from_user_url } end diff --git a/app/views/contact_mailer/user_message.rhtml b/app/views/contact_mailer/user_message.rhtml index 88e4dd05b..9db6d9576 100644 --- a/app/views/contact_mailer/user_message.rhtml +++ b/app/views/contact_mailer/user_message.rhtml @@ -4,8 +4,8 @@ Hi <%=@recipient_user.name%>, Your details have not been given to anyone, unless you choose to reply to this message, which will then go directly to the person who wrote the message. -See the Freedom of Information requests that they have made: -<%= @recipient_url %> +You might like to see the Freedom of Information requests that +<%=@from_user.name %> has made: <%= @from_user_url %> -- the WhatDoTheyKnow team |