0
@@ -296,6 +296,9 @@ module ActionMailer #:nodoc:
0
     @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ]
0
     cattr_accessor :default_implicit_parts_order
0
 
0
+    cattr_reader :protected_instance_variables
0
+    @@protected_instance_variables = %w(@body)
0
+
0
     # Specify the BCC addresses for the message
0
     adv_attr_accessor :bcc
0
 

0
@@ -273,6 +273,13 @@ class TestMailer < ActionMailer::Base
0
     headers      "return-path" => "another@somewhere.test"
0
   end
0
 
0
+  def body_ivar(recipient)
0
+    recipients   recipient
0
+    subject      "Body as a local variable"
0
+    from         "test@example.com"
0
+    body         :body => "foo", :bar => "baz"
0
+  end
0
+
0
   class <<self
0
     attr_accessor :received_body
0
   end
0
@@ -926,6 +933,11 @@ EOF
0
     TestMailer.deliver_return_path
0
     assert_match %r{^Return-Path: <another@somewhere.test>}, MockSMTP.deliveries[0][0]
0
   end
0
+
0
+  def test_body_is_stored_as_an_ivar
0
+    mail = TestMailer.create_body_ivar(@recipient)
0
+    assert_equal "body: foo\nbar: baz", mail.body
0
+  end
0
 end
0
 
0
 end # uses_mocha

0
@@ -296,9 +296,9 @@ module ActionView #:nodoc:
0
           @assigns.each { |key, value| instance_variable_set("@#{key}", value) }
0
 
0
           if @controller
0
-            variables = @controller.instance_variables
0
+            variables = @controller.instance_variable_names
0
             variables -= @controller.protected_instance_variables if @controller.respond_to?(:protected_instance_variables)
0
-            variables.each {|name| instance_variable_set(name, @controller.instance_variable_get(name)) }
0
+            variables.each { |name| instance_variable_set(name, @controller.instance_variable_get(name)) }
0
           end
0
 
0
           @assigns_added = true