diff options
| author | James Miller <james@jkmillertech.com> | 2008-09-10 11:27:38 -0700 |
|---|---|---|
| committer | James Miller <james@jkmillertech.com> | 2008-09-10 11:27:38 -0700 |
| commit | 383467fb5da3d0d17bb3e41b6b4c0ab69b2ef082 (patch) | |
| tree | 2e81d95ccbb48189f8d456f69c32389bbb122c71 /actionmailer/lib | |
| parent | 6704e90c900555196080165c242d6999d1fcfaba (diff) | |
| parent | 6d1be5f1eb83fb693ffd00e1967c1b3ca1c9ece3 (diff) | |
| download | rails-383467fb5da3d0d17bb3e41b6b4c0ab69b2ef082.tar.gz rails-383467fb5da3d0d17bb3e41b6b4c0ab69b2ef082.tar.bz2 rails-383467fb5da3d0d17bb3e41b6b4c0ab69b2ef082.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 96e514e0db..bfe435550b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -466,7 +466,7 @@ module ActionMailer #:nodoc: template = template_root["#{mailer_name}/#{File.basename(path)}"] # Skip unless template has a multipart format - next unless template.multipart? + next unless template && template.multipart? @parts << Part.new( :content_type => template.content_type, |