diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-26 19:15:20 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-26 19:15:32 +0100 |
| commit | af43674c1cc73630736537a73e79a24ac2bef995 (patch) | |
| tree | a012a938a47edac1ca987024dce2c79224359875 /actionmailer/lib/action_mailer/deprecated_api.rb | |
| parent | bdc39fad3629f89f552e40d13b7612db15ffa552 (diff) | |
| download | rails-af43674c1cc73630736537a73e79a24ac2bef995.tar.gz rails-af43674c1cc73630736537a73e79a24ac2bef995.tar.bz2 rails-af43674c1cc73630736537a73e79a24ac2bef995.zip | |
Fix failing tests on AM about render(:body => Hash).
Diffstat (limited to 'actionmailer/lib/action_mailer/deprecated_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/deprecated_api.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb index 61101c26a1..36eec1087e 100644 --- a/actionmailer/lib/action_mailer/deprecated_api.rb +++ b/actionmailer/lib/action_mailer/deprecated_api.rb @@ -93,10 +93,12 @@ module ActionMailer def render(*args) options = args.last.is_a?(Hash) ? args.last : {} - if options[:body] + + if options[:body].is_a?(Hash) ActiveSupport::Deprecation.warn(':body in render deprecated. Please use instance ' << 'variables as assigns instead', caller[0,1]) - body options.delete(:body) + + options[:body].each { |k,v| instance_variable_set(:"@#{k}", v) } end super end |