diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-01 16:10:40 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-01 16:10:40 +0000 |
commit | 6cc961555d723e23a8a932398fe2aa2073cb8d6e (patch) | |
tree | 1e6110974eb76c089d85b945afdac410e580b840 | |
parent | 9a248a83b5b129ed589f8d829b6ce7316bc1a272 (diff) | |
download | rails-6cc961555d723e23a8a932398fe2aa2073cb8d6e.tar.gz rails-6cc961555d723e23a8a932398fe2aa2073cb8d6e.tar.bz2 rails-6cc961555d723e23a8a932398fe2aa2073cb8d6e.zip |
Fixed that cached template loading would still check the file system to see if the file existed #258 [Andreas Schwarz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@43 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/base.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d4cfc6edfa..4f32e39822 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that cached template loading would still check the file system to see if the file existed #258 [Andreas Schwarz] + * Added options to tailor header tag, div id, and div class on ActiveRecordHelper#error_messages_for [josh] * Added graceful handling of non-alphanumeric names and misplaced brackets in input parameters [bitsweat] diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 84c8040760..683cb8af6f 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -238,7 +238,8 @@ module ActionView #:nodoc: end def template_exists?(template_path, extension) - FileTest.exists?(full_template_path(template_path, extension)) + (cache_template_loading && @@loaded_templates.has_key?(template_path)) || + FileTest.exists?(full_template_path(template_path, extension)) end def read_template_file(template_path) |