diff options
| author | Colin Law <colin@clanlaw.org.uk> | 2009-01-11 12:13:50 +0000 |
|---|---|---|
| committer | Colin Law <colin@clanlaw.org.uk> | 2009-01-11 12:13:50 +0000 |
| commit | 55901d7d86f5608c4a07386ca6378121eb8127cb (patch) | |
| tree | 8ede6a21529dfac8c818a3fe1584fb46f00c03ff /actionpack/lib/action_view/renderable.rb | |
| parent | 3e60ea6c231810e2b850492a86874b4800dfbf27 (diff) | |
| parent | cf4b24407ada79c133fbae1ec7db692882225956 (diff) | |
| download | rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.gz rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.bz2 rails-55901d7d86f5608c4a07386ca6378121eb8127cb.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
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 |