aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-15 13:02:15 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-15 13:02:15 +0000
commitfeefa1b5d9c8765cef63dd6601805b912e7d475c (patch)
tree72ee72d03dc084e79bb6f7deb3b554af845854ac
parent36cc6ce0d49f5bf3c5808307afeea5985dc6d8dc (diff)
Handle the case where the subject is not set
-rw-r--r--app/models/application_mailer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb
index eccc46990..1a97a4bf9 100644
--- a/app/models/application_mailer.rb
+++ b/app/models/application_mailer.rb
@@ -150,8 +150,8 @@ class ApplicationMailer < ActionMailer::Base
# already set.
@mime_version ||= "1.0" if !@parts.empty?
- # *** Convert the subject (which might be a SafeBuffer) into a string
- @subject = @subject.to_str
+ # *** Convert into a string
+ @subject = @subject.to_str if @subject
# build the mail object itself
@mail = create_mail