aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-10-14 20:59:33 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-14 20:59:33 -0700
commit5b8e6279acaa46f22118122c49350e1b08c7371a (patch)
tree0399d061ad6d5fc1dd8e9b76125fc6956860291d
parente19ab99134a80ad2951473f8c2c6148c8f1839fd (diff)
downloadrails-5b8e6279acaa46f22118122c49350e1b08c7371a.tar.gz
rails-5b8e6279acaa46f22118122c49350e1b08c7371a.tar.bz2
rails-5b8e6279acaa46f22118122c49350e1b08c7371a.zip
AV expects options[:locals] to be a Hash
-rw-r--r--actionmailer/lib/action_mailer/base.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index d8b08116eb..24be66d197 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -599,6 +599,7 @@ module ActionMailer #:nodoc:
end
def render(opts)
+ opts[:locals] ||= {}
layout, file = opts.delete(:layout), opts[:file]
begin