From 6cc961555d723e23a8a932398fe2aa2073cb8d6e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 1 Dec 2004 16:10:40 +0000 Subject: [PATCH] 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 --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_view/base.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d4cfc6edfaad2..4f32e3982295a 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 84c80407600d0..683cb8af6fecc 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -238,7 +238,8 @@ def full_template_path(template_path, extension) 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)