aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-11-29 16:03:44 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-29 16:03:44 -0600
commit1182658e767d2db4a46faed35f0b1075c5dd9a88 (patch)
tree720725f4afab6885c3ce92d508cabc4e85abb93b
parentcec8a92a6d37699a2dbc8fdeb5393113d3621ef9 (diff)
downloadrails-1182658e767d2db4a46faed35f0b1075c5dd9a88.tar.gz
rails-1182658e767d2db4a46faed35f0b1075c5dd9a88.tar.bz2
rails-1182658e767d2db4a46faed35f0b1075c5dd9a88.zip
Make sure #compute_public_path caching allows to return different results for different given sources [#1471 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 134907311a..4ec7a383e5 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -592,7 +592,7 @@ module ActionView
source
else
CacheGuard.synchronize do
- Cache[@cache_key] ||= begin
+ Cache[@cache_key + [source]] ||= begin
source += ".#{extension}" if missing_extension?(source) || file_exists_with_extension?(source)
source = "/#{directory}/#{source}" unless source[0] == ?/
source = rewrite_asset_path(source)