diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
commit | d9615928866115015e9ec48ac88a90869ef85d9b (patch) | |
tree | e6783aeeb36f1b8263d97d2548a39a4e5ee58fa6 /actionpack/lib/action_view/renderable.rb | |
parent | 276ec16007b03d0a527fb0b83a7ee0b81e460fa1 (diff) | |
parent | 82443ecfad5e756da922d6a166b0093c8a74d720 (diff) | |
download | rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.gz rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.bz2 rails-d9615928866115015e9ec48ac88a90869ef85d9b.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/renderable.rb')
-rw-r--r-- | actionpack/lib/action_view/renderable.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb index d8e72f1179..153e14f68b 100644 --- a/actionpack/lib/action_view/renderable.rb +++ b/actionpack/lib/action_view/renderable.rb @@ -60,7 +60,7 @@ module ActionView def compile(local_assigns) render_symbol = method_name(local_assigns) - if recompile?(render_symbol) + if !Base::CompiledTemplates.method_defined?(render_symbol) || recompile? compile!(render_symbol, local_assigns) end end @@ -89,11 +89,8 @@ module ActionView end end - # Method to check whether template compilation is necessary. - # The template will be compiled if the file has not been compiled yet, or - # if local_assigns has a new key, which isn't supported by the compiled code yet. - def recompile?(symbol) - !Base::CompiledTemplates.method_defined?(symbol) || !loaded? + def recompile? + false end end end |