diff options
| author | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
| commit | 4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5 (patch) | |
| tree | 6f080f704435d22dbfee6ffd454529c12e5bb505 /actionmailer | |
| parent | 7b622786fcc5046a06989ec7a3cbf46f92e04dea (diff) | |
| parent | 84f6da45a19d335be320991cab44f492f61dc5c7 (diff) | |
| download | rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.gz rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.bz2 rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer')
| -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 cd0c5bea53..ef3820ad67 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -617,9 +617,9 @@ module ActionMailer #:nodoc: def each_template(paths, name, &block) #:nodoc: Array(paths).each do |path| templates = lookup_context.find_all(name, path) + templates = templates.uniq_by { |t| t.formats } unless templates.empty? - templates = templates.uniq_by { |t| t.details[:formats] } templates.each(&block) return end |