aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-12-16 08:12:24 +0100
committerPiotr Sarnacki <drogus@gmail.com>2010-12-22 09:44:46 +0100
commit09195f10bd3add1be1983a42760113ef2bd31602 (patch)
treebd33ce631742f54fc03153022f4075e56c5ea081 /actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
parentb613145284624b7344675072d2502f9212097965 (diff)
downloadrails-09195f10bd3add1be1983a42760113ef2bd31602.tar.gz
rails-09195f10bd3add1be1983a42760113ef2bd31602.tar.bz2
rails-09195f10bd3add1be1983a42760113ef2bd31602.zip
Do not use the same hash instance for expansions [#6114 state:resolved]
Using the same hash instance makes using the same expansions for both javascripts and stylesheets.
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
index e52797042f..fc0cca28b9 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
@@ -11,7 +11,9 @@ module ActionView
attr_reader :config, :asset_paths
class_attribute :expansions
- self.expansions = { }
+ def self.inherited(base)
+ base.expansions = { }
+ end
def initialize(config, asset_paths)
@config = config