aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderable.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-29 19:27:19 -0600
committerYehuda Katz <wycats@gmail.com>2009-01-01 00:13:11 -0800
commitab7c25d51174779547ab74bcd23e40204891e370 (patch)
tree629a893593b5114f3aca9f1f16f9fe09362f19d5 /actionpack/lib/action_view/renderable.rb
parent860dd77006b66a0b0805e3e6edc6b80739f6fca3 (diff)
downloadrails-ab7c25d51174779547ab74bcd23e40204891e370.tar.gz
rails-ab7c25d51174779547ab74bcd23e40204891e370.tar.bz2
rails-ab7c25d51174779547ab74bcd23e40204891e370.zip
Clean up view path cruft and split path implementations into Template::Path and Template::EagerPath
Diffstat (limited to 'actionpack/lib/action_view/renderable.rb')
-rw-r--r--actionpack/lib/action_view/renderable.rb9
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