Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 6cc961555d723e23a8a932398fe2aa2073cb8d6e 1 parent 9a248a8
@dhh dhh authored
Showing with 4 additions and 1 deletion.
  1. +2 −0  actionpack/CHANGELOG
  2. +2 −1  actionpack/lib/action_view/base.rb
View
2  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]
View
3  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)
Please sign in to comment.
Something went wrong with that request. Please try again.