diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-12-18 19:29:01 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-13 12:36:42 +0000 |
| commit | 75ea3f8298da5943c5b762dc4304b85769b391e1 (patch) | |
| tree | 9fe7665d537857b897d116df2fb2ee89cec65500 /app/controllers/admin_request_controller.rb | |
| parent | 18181d149130490cacd2bd4e558b94e9647137f1 (diff) | |
Allow from_admin_message to take a name and email.
Previously it accepted a user, but for this usage we won't necessarily
have one.
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 4d45ced8b..ca4179acb 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -281,7 +281,8 @@ class AdminRequestController < AdminController if ! info_request.is_external? ContactMailer.from_admin_message( - info_request.user, + info_request.user.name, + info_request.user.email, subject, params[:explanation].strip.html_safe ).deliver |