diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-05 02:07:25 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-05 02:08:02 +0200 |
| commit | 5711a35ad8faa3fb6d138b234cbe9acfad27a9a8 (patch) | |
| tree | 9b40f5b0d2c29b21239b732fcb1830b7013db1cc /actionpack/lib | |
| parent | ac2f6bd6431311b1eae9d8ac6c217d2c2fbc2b3d (diff) | |
| download | rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.tar.gz rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.tar.bz2 rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.zip | |
Ensure default_asset_host_protocol is respected, closes #2980.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_view/asset_paths.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb index b104d34fb5..c2a6809f58 100644 --- a/actionpack/lib/abstract_controller/asset_paths.rb +++ b/actionpack/lib/abstract_controller/asset_paths.rb @@ -3,7 +3,8 @@ module AbstractController extend ActiveSupport::Concern included do - config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir + config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, + :stylesheets_dir, :default_asset_host_protocol end end end diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb index cf30ad7e57..3321b4181d 100644 --- a/actionpack/lib/action_view/asset_paths.rb +++ b/actionpack/lib/action_view/asset_paths.rb @@ -16,8 +16,6 @@ module ActionView # roots. Rewrite the asset path for cache-busting asset ids. Include # asset host, if configured, with the correct request protocol. # - # When include_host is true and the asset host does not specify the protocol - # the protocol parameter specifies how the protocol will be added. # When :relative (default), the protocol will be determined by the client using current protocol # When :request, the protocol will be the request protocol # Otherwise, the protocol is used (E.g. :http, :https, etc) @@ -25,11 +23,10 @@ module ActionView source = source.to_s return source if is_uri?(source) - options[:include_host] ||= true source = rewrite_extension(source, dir, options[:ext]) if options[:ext] source = rewrite_asset_path(source, dir, options) source = rewrite_relative_url_root(source, relative_url_root) - source = rewrite_host_and_protocol(source, options[:protocol]) if options[:include_host] + source = rewrite_host_and_protocol(source, options[:protocol]) source end diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 6e93bd3035..2cf54b7777 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -1,3 +1,5 @@ +require "action_controller/railtie" + module Sprockets autoload :Bootstrap, "sprockets/bootstrap" autoload :Helpers, "sprockets/helpers" @@ -8,7 +10,7 @@ module Sprockets # TODO: Get rid of config.assets.enabled class Railtie < ::Rails::Railtie - config.default_asset_host_protocol = :relative + config.action_controller.default_asset_host_protocol = :relative rake_tasks do load "sprockets/assets.rake" |