Permalink
Browse files

Retain symbol method key and assign_method_name.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4515 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent ec43212 commit 9444206dd5cd254d924335c8c682fa3ded683ac0 @jeremy jeremy committed Jun 29, 2006
Showing with 7 additions and 3 deletions.
  1. +7 −3 actionpack/lib/action_view/base.rb
@@ -468,8 +468,13 @@ def templates_requiring_setup
%w(rxml rjs)
end
+ def assign_method_name(extension, template, file_name)
+ method_key = file_name || template
+ @@method_names[method_key] ||= compiled_method_name(extension, template, file_name)
+ end
+
def compiled_method_name(extension, template, file_name)
- ['_run', extension, compiled_method_name_file_path_segment(file_name)].compact.join('_')
+ ['_run', extension, compiled_method_name_file_path_segment(file_name)].compact.join('_').to_sym
end
def compiled_method_name_file_path_segment(file_name)
@@ -484,8 +489,7 @@ def compiled_method_name_file_path_segment(file_name)
end
def compile_template(extension, template, file_name, local_assigns)
- method_key = file_name || template
- render_symbol = @@method_names[method_key] ||= compiled_method_name(extension, template, file_name)
+ render_symbol = assign_method_name(extension, template, file_name)
render_source = create_template_source(extension, template, render_symbol, local_assigns.keys)
line_offset = @@template_args[render_symbol].size

0 comments on commit 9444206

Please sign in to comment.