aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-07-05 02:17:25 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-07-05 02:17:25 +0000
commitead99f3f2e7085688b7d31b2cf2af9aecc1a1982 (patch)
tree0b3d7076eb4e769d24d9b35594a79f0c64595e43 /actionpack/lib
parent06411f4261cd0507be7b25883ed761ece9e8337f (diff)
downloadrails-ead99f3f2e7085688b7d31b2cf2af9aecc1a1982.tar.gz
rails-ead99f3f2e7085688b7d31b2cf2af9aecc1a1982.tar.bz2
rails-ead99f3f2e7085688b7d31b2cf2af9aecc1a1982.zip
Fixed that real files and symlinks should be treated the same when compiling templates (closes #5438) [zachary@panandscan.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4546 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index d3758f4583..87b0174703 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -425,7 +425,8 @@ module ActionView #:nodoc:
if @@compile_time[render_symbol] && supports_local_assigns?(render_symbol, local_assigns)
if file_name && !@@cache_template_loading
- @@compile_time[render_symbol] < File.mtime(file_name)
+ @@compile_time[render_symbol] < File.mtime(file_name) || (File.symlink?(file_name) ?
+ @@compile_time[render_symbol] < File.lstat(file_name).mtime : false)
end
else
true