Adds the changes from bikebike/bikebike for tracked files that weren't committed to git.
Former-commit-id: 23acad3a6de4f349390d87a88884b754abefdcfb
This commit is contained in:
@@ -149,6 +149,7 @@ class UserMailer < ActionMailer::Base
|
||||
end
|
||||
|
||||
def contact(from, subject, message, email_list)
|
||||
return if subject =~ /^[a-z]{10}$/
|
||||
@message = message
|
||||
@from = from.is_a?(Integer) ? User.find(from) : from
|
||||
|
||||
@@ -156,6 +157,7 @@ class UserMailer < ActionMailer::Base
|
||||
end
|
||||
|
||||
def contact_details(from, subject, message, request, params)
|
||||
return if subject =~ /^[a-z]{10}$/
|
||||
@message = message
|
||||
@from = from.is_a?(Integer) ? User.find(from) : from
|
||||
@request = request
|
||||
|
||||
Reference in New Issue
Block a user