aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-02-28 11:52:00 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2011-02-28 11:52:00 -0200
commit53b17e9ad08ada8709f6610d33d1bf624e5ef2d0 (patch)
treebf7a9c55f7c05ca59488893bf94fc7431d309ee1 /actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
parent801e314006ca755b94eccc6e7f80b1655168a250 (diff)
downloadrails-53b17e9ad08ada8709f6610d33d1bf624e5ef2d0.tar.gz
rails-53b17e9ad08ada8709f6610d33d1bf624e5ef2d0.tar.bz2
rails-53b17e9ad08ada8709f6610d33d1bf624e5ef2d0.zip
javascript_include_tag shouldn't raise if you register an expansion key with nil value
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index f3e041de95..a48c87b49a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -46,7 +46,7 @@ module ActionView
def register_stylesheet_expansion(expansions)
style_expansions = StylesheetIncludeTag.expansions
expansions.each do |key, values|
- style_expansions[key] = (style_expansions[key] || []) | Array(values) if values
+ style_expansions[key] = (style_expansions[key] || []) | Array(values)
end
end
end