aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/renderable.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-11-28 14:31:54 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-28 14:31:54 -0600
commit9fccf72725a72baeda508eccd6113b44329e0a7c (patch)
tree095f57040de3506bc275737f2e5409f972cf22ac /actionpack/lib/action_view/renderable.rb
parent9fc23745f1511d8d97433828d9ca87970994d138 (diff)
downloadrails-9fccf72725a72baeda508eccd6113b44329e0a7c.tar.gz
rails-9fccf72725a72baeda508eccd6113b44329e0a7c.tar.bz2
rails-9fccf72725a72baeda508eccd6113b44329e0a7c.zip
fixed template recompile issue with previous commit and add some better tests so we can make sure it doesn't happen again
Diffstat (limited to 'actionpack/lib/action_view/renderable.rb')
-rw-r--r--actionpack/lib/action_view/renderable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb
index c04399f2c9..7258ad04bf 100644
--- a/actionpack/lib/action_view/renderable.rb
+++ b/actionpack/lib/action_view/renderable.rb
@@ -96,7 +96,7 @@ module ActionView
# 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)
- !(frozen? && Base::CompiledTemplates.method_defined?(symbol))
+ !Base::CompiledTemplates.method_defined?(symbol) || !loaded?
end
end
end