1 files changed, 11 insertions, 6 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 a48c87b49a..c3dcd410bb 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
@@ -1,6 +1,5 @@
 require 'active_support/concern'
 require 'active_support/core_ext/file'
-require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
 
 module ActionView
@@ -8,8 +7,6 @@ module ActionView
     module AssetTagHelper
 
       class StylesheetIncludeTag < AssetIncludeTag
-        include TagHelper
-
         def asset_name
           'stylesheet'
         end
@@ -63,7 +60,11 @@ module ActionView
         #   stylesheet_path "http://www.railsapplication.com/css/style" # => http://www.railsapplication.com/css/style
         #   stylesheet_path "http://www.railsapplication.com/css/style.css" # => http://www.railsapplication.com/css/style.css
         def stylesheet_path(source)
-          asset_paths.compute_public_path(source, 'stylesheets', 'css')
+          if config.use_sprockets
+            asset_path(source, 'css')
+          else
+            asset_paths.compute_public_path(source, 'stylesheets', 'css')
+          end
         end
         alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
@@ -136,8 +137,12 @@ module ActionView
         #   stylesheet_link_tag :all, :concat => true
         #
         def stylesheet_link_tag(*sources)
-          @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
-          @stylesheet_include.include_tag(*sources)
+          if config.use_sprockets
+            sprockets_stylesheet_link_tag(*sources)
+          else
+            @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
+            @stylesheet_include.include_tag(*sources)
+          end
         end
 
       end