diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:52:55 -0700 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:52:55 -0700 |
commit | 0adcb32b81002528ea27855e2303118cbe9aefc1 (patch) | |
tree | c0f3efbf627045d9443e6ff3fadcb40e8e85dbdc /app/controllers/user_controller.rb | |
parent | 844351acd314467dae44af0e10847dfd597fcc03 (diff) | |
parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) |
Merge branch 'release/0.8'
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r-- | app/controllers/user_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 4ee527bae..fc8b6e014 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -422,7 +422,7 @@ class UserController < ApplicationController ContactMailer.deliver_user_message( @user, @recipient_user, - main_url(user_url(@user)), + user_url(@user), params[:contact][:subject], params[:contact][:message] ) |