diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-02-15 13:05:03 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-02-15 13:05:03 +0000 |
| commit | 2a2dd14ca5a2be56ed8d6dc29c264c4a772fabce (patch) | |
| tree | f8e8e9f4dc7f6e8eb54521442d455f2c03fff047 | |
| parent | a1420afa581a48391893bb9a32d9708ba4ada386 (diff) | |
| parent | feefa1b5d9c8765cef63dd6601805b912e7d475c (diff) | |
Merge branch 'hotfix/0.7.0.1' into wdtk
| -rw-r--r-- | app/models/application_mailer.rb | 4 |
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 |