Pass template object to Handler#compile

rails · Apr 24, 2008 · 1959db3 · 1959db3
1 parent a074884
commit 1959db3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb
@@ -13,7 +13,7 @@ def compile(template)
         content_type_handler = (@view.send!(:controller).respond_to?(:response) ? "controller.response" : "controller")
         "#{content_type_handler}.content_type ||= Mime::XML\n" +
         "xml = ::Builder::XmlMarkup.new(:indent => 2)\n" +
-        template +
+        template.source +
         "\nxml.target!\n"
       end
 

diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -95,7 +95,7 @@ def compiled_method_name_file_path_segment(file_name)
 
       # Method to create the source code for a given template.
       def create_template_source(template, render_symbol)
-        body = compile(template.source)
+        body = compile(template)
 
         self.template_args[render_symbol] ||= {}
         locals_keys = self.template_args[render_symbol].keys | template.locals.keys

diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb
@@ -43,7 +43,7 @@ class ERB < TemplateHandler
       include Compilable
 
       def compile(template)
-        ::ERB.new(template, nil, @view.erb_trim_mode).src
+        ::ERB.new(template.source, nil, @view.erb_trim_mode).src
       end
 
       def cache_fragment(block, name = {}, options = nil) #:nodoc:

diff --git a/actionpack/lib/action_view/template_handlers/rjs.rb b/actionpack/lib/action_view/template_handlers/rjs.rb
@@ -9,7 +9,7 @@ def self.line_offset
 
       def compile(template)
         "controller.response.content_type ||= Mime::JS\n" +
-        "update_page do |page|\n#{template}\nend"
+        "update_page do |page|\n#{template.source}\nend"
       end
 
       def cache_fragment(block, name = {}, options = nil) #:nodoc: