aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-07-14 13:47:51 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-07-14 13:47:51 -0700
commit3fbefecc9cdc0d1a903d6ab76170223166cc69ab (patch)
tree15c30b1dfc1849f2922fc78d5815d360040ea238 /actionpack/lib
parent07578ac85585d3c64d4d38d4892fd31582c7c473 (diff)
downloadrails-3fbefecc9cdc0d1a903d6ab76170223166cc69ab.tar.gz
rails-3fbefecc9cdc0d1a903d6ab76170223166cc69ab.tar.bz2
rails-3fbefecc9cdc0d1a903d6ab76170223166cc69ab.zip
Remove dead code from merge
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/template_handlers/compilable.rb30
1 files changed, 0 insertions, 30 deletions
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
index 2b96e7f133..7e45761481 100644
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -16,36 +16,6 @@ module ActionView
@view.send(:execute, template, local_assigns)
end
- # Compile and evaluate the template's code
- def compile_template(template)
- return false unless recompile_template?(template)
-
- @@mutex.synchronize do
- locals_code = template.locals.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
-
- source = <<-end_src
- def #{template.method}(local_assigns)
- old_output_buffer = output_buffer;#{locals_code};#{compile(template)}
- ensure
- self.output_buffer = old_output_buffer
- end
- end_src
-
- begin
- file_name = template.filename || 'compiled-template'
- ActionView::Base::CompiledTemplates.module_eval(source, file_name, 0)
- rescue Exception => e # errors from template code
- if logger = ActionController::Base.logger
- logger.debug "ERROR: compiling #{template.method} RAISED #{e}"
- logger.debug "Function body: #{source}"
- logger.debug "Backtrace: #{e.backtrace.join("\n")}"
- end
-
- raise ActionView::TemplateError.new(template, @view.assigns, e)
- end
- end
- end
-
private
# Method to check whether template compilation is necessary.
# The template will be compiled if the inline template or file has not been compiled yet,