0
@@ -47,19 +47,18 @@ module Haml
0
     # with <tt>local_assigns</tt> available as local variables within the template.
0
     # Returns the result as a string.
0
     def render(template, local_assigns={})
0
-      assigns = @view.assigns.dup
0
-
0
-      # Do content for layout on its own to keep things working in partials
0
-      if content_for_layout = @view.instance_variable_get("@content_for_layout")
0
-        assigns['content_for_layout'] = content_for_layout
0
-      end
0
-
0
-      # Get inside the view object's world
0
-      @view.instance_eval do
0
-        # Set all the instance variables
0
-        assigns.each do |key,val|
0
-          instance_variable_set "@#{key}", val
0
+      unless @view.instance_variable_get("@assigns_added")
0
+        assigns = @view.assigns.dup
0
+      
0
+        # Get inside the view object's world
0
+        @view.instance_eval do
0
+          # Set all the instance variables
0
+          assigns.each do |key,val|
0
+            instance_variable_set "@#{key}", val
0
+          end
0
         end
0
+        
0
+        @view.instance_variable_set("@assigns_added", true)
0
       end
0
 
0
       options = @@options.dup

0
@@ -9,14 +9,15 @@ require File.dirname(__FILE__) + '/../lib/haml/template'
0
 require File.dirname(__FILE__) + '/mocks/article'
0
 
0
 class TemplateTest < Test::Unit::TestCase
0
-  @@templates = %w{       very_basic        standard  helpers
0
-    whitespace_handling   original_engine   list      helpful
0
-    silent_script         tag_parsing       just_stuff}
0
+  @@templates = %w{       very_basic        standard    helpers
0
+    whitespace_handling   original_engine   list        helpful
0
+    silent_script         tag_parsing       just_stuff  partials }
0
 
0
   def setup
0
     ActionView::Base.register_template_handler("haml", Haml::Template)
0
     @base = ActionView::Base.new(File.dirname(__FILE__) + "/../test/templates/")
0
     @base.instance_variable_set("@article", Article.new)
0
+    @base.instance_variable_set("@foo", 'value one')
0
   end
0
 
0
   def render(text)