diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-12 17:03:17 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-12 17:03:17 -0700 |
commit | 45b79d933cd2433b30ae98e7dadc4ae060e170c9 (patch) | |
tree | 6bc79848cf6aab926cdcfb51b298fe26b68a0ec0 /actionpack/lib/action_view | |
parent | 992fda16ed662f028700d63a8dcbd1837f1d58ab (diff) | |
parent | 08b0cf07dbc639c8609118eaeb34330d5168e8b2 (diff) | |
download | rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.tar.gz rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.tar.bz2 rails-45b79d933cd2433b30ae98e7dadc4ae060e170c9.zip |
Merge branch 'conditional-get'
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/renderable.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb index 5fe1ca86f3..89ac500717 100644 --- a/actionpack/lib/action_view/renderable.rb +++ b/actionpack/lib/action_view/renderable.rb @@ -31,10 +31,10 @@ module ActionView view.send(:evaluate_assigns) view.send(:set_controller_content_type, mime_type) if respond_to?(:mime_type) - view.send(:execute, method(local_assigns), local_assigns) + view.send(:execute, method_name(local_assigns), local_assigns) end - def method(local_assigns) + def method_name(local_assigns) if local_assigns && local_assigns.any? local_assigns_keys = "locals_#{local_assigns.keys.map { |k| k.to_s }.sort.join('_')}" end @@ -44,7 +44,7 @@ module ActionView private # Compile and evaluate the template's code (if necessary) def compile(local_assigns) - render_symbol = method(local_assigns) + render_symbol = method_name(local_assigns) @@mutex.synchronize do if recompile?(render_symbol) |