mirror of
https://github.com/github/rails.git
synced 2026-01-27 23:38:11 -05:00
Remove dead code from merge
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user